diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 358e72450b5c..804cefc31b4e 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -474,7 +474,7 @@ return FALSE //Are we PBing someone? If so, set pointblank to TRUE shoot_live_shot(user, (get_dist(user, target) <= 1), target, message) //Making sure whether the target is in vicinity for the pointblank shot - . = TRUE // we already shot + //process the chamber... process_chamber(shooter = user) update_appearance() @@ -551,7 +551,7 @@ ignored_mobs = user ) - //cloud sent a meme in the discord. i dont know if its true, but i made this piece of code in honor of it + //cloudy sent a meme in the discord. i dont know if its true, but i made this piece of code in honor of it var/mob/living/carbon/human/living_human = user if(istype(living_human)) if(!living_human.wear_neck) @@ -566,7 +566,7 @@ return //dont bother if we already are affected by it if(istype(living_human.wear_neck, /obj/item/clothing/neck/tie/lesbian) || living_human.wear_neck.icon_state == "lesbian") - var/use_space = "[living_human.generic_adjective ? " " : null]" + var/use_space = "[living_human.generic_adjective ? " " : ""]" living_human.generic_adjective = "lesbian[use_space][living_human.generic_adjective]" //i actually don't remember the meme. it was something like lesbians will stop working if they see another with a gun. or something. /obj/item/gun/CtrlClick(mob/user) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 1432968198e7..9c42abaa71a5 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -347,7 +347,7 @@ /obj/item/gun/ballistic/pre_fire(atom/target, mob/living/user, message = TRUE, flag, params = null, zone_override = "", bonus_spread = 0, dual_wielded_gun = FALSE) prefire_empty_checks() - ..() + return ..() /obj/item/gun/ballistic/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, burst_firing = FALSE, spread_override = 0, iteration = 0) . = ..() //The gun actually firing