From 5348df0322d11f91de0188c1b7a2b5e8e98b65ef Mon Sep 17 00:00:00 2001 From: Dwaggy Date: Mon, 15 Apr 2019 18:10:30 +0100 Subject: [PATCH 1/3] RE-added NSFW weapon to the BSG secondary box. This used to be a thing before, but had to be commented out due to the NSFW's lack of recharging batteries working. This however has been fixed, so I've gone ahead and uncommented the weapon where it used to be. --- code/game/objects/items/gunbox_yw.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/gunbox_yw.dm b/code/game/objects/items/gunbox_yw.dm index bb020183f3..ff35f9ceb9 100644 --- a/code/game/objects/items/gunbox_yw.dm +++ b/code/game/objects/items/gunbox_yw.dm @@ -26,10 +26,10 @@ /obj/item/gunbox/blueshield/secondary/attack_self(mob/living/user) var/list/options = list() -// options["NSFW Variable Pistol(Microbattery)"] = list(/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos) It's broken, and I can't fix it because the snowflake keeps metastasizing. + options["NSFW Variable Pistol(Microbattery)"] = list(/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos) options["E-Gun (Weapon Cell)"] = list(/obj/item/weapon/gun/energy/gun, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon) options["Consul Revolver (.44)"] = list(/obj/item/weapon/gun/projectile/revolver/consul, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44/rubber) - var/choice = input(user,"Would you prefer an e-gun or a revolver?") as null|anything in options + var/choice = input(user,"Would you prefer an NSFW, e-gun or a revolver?") as null|anything in options if(src && choice) var/list/things_to_spawn = options[choice] for(var/new_type in things_to_spawn) // Spawn all the things, the gun and the ammo. From 199afd0fa1a3d73ee48b036a7155b060b8a3cb50 Mon Sep 17 00:00:00 2001 From: Dwaggy Date: Mon, 15 Apr 2019 21:14:25 +0100 Subject: [PATCH 2/3] Adds ability to lick ones own wounds with the new wound-lick ability I won't lie, this is a possibly slightly hacky way around it, by changing the range check from the living_mob(1) in the var itself, to an if check later in. What this means in the front side, is that all carbon/human mobs on screen will show up in the targetable list if its used instead of just right clicking someone, and the 'check' for range will happen just before licks happen. telling them to get closer to the intended person instead. if theres a cleaner way of doing this, of which I'm fairly sure there is, we can change to that when we find it. --- code/modules/mob/living/carbon/lick_wounds.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index 4c992e772c..fb34f95934 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M in living_mobs(1)) +/mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M) //YWedit, origionally, living/carbon/M in living_mobs(1), However, living_mobs does not include src as possible target. set name = "Lick Wounds" set category = "Abilities" set desc = "Disinfect and heal small wounds with your saliva." @@ -6,6 +6,10 @@ if(nutrition < 50) to_chat(src, "You need more energy to produce antiseptic enzymes. Eat something and try again.") return + //YW edit. Added the distance check to here. this allows the ability to lick ones own wounds. although this also means that all living/carbon/M appear on the list if used. + if (get_dist(src,M) >= 2) + src << "You need to be closer to do that." + return if ( ! (istype(src, /mob/living/carbon/human) || \ istype(src, /mob/living/silicon)) ) @@ -68,7 +72,7 @@ return else - visible_message("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.", + visible_message("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.", "drags their tongue across \a [W.desc] on [M]'s [affecting.name].", "drips saliva onto \a [W.desc] on [M]'s [affecting.name].", "uses their tongue to disinfect \a [W.desc] on [M]'s [affecting.name].", From 0786f599d2b078636dace8d78fb9098076c3ffbf Mon Sep 17 00:00:00 2001 From: Hawk-v3 Date: Mon, 15 Apr 2019 22:14:50 +0100 Subject: [PATCH 3/3] Update code/modules/mob/living/carbon/lick_wounds.dm Co-Authored-By: Dwaggy --- code/modules/mob/living/carbon/lick_wounds.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index fb34f95934..17ad746d4d 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M) //YWedit, origionally, living/carbon/M in living_mobs(1), However, living_mobs does not include src as possible target. +/mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M) //YWedit, originally, living/carbon/M in living_mobs(1), However, living_mobs does not include src as possible target. set name = "Lick Wounds" set category = "Abilities" set desc = "Disinfect and heal small wounds with your saliva." @@ -83,4 +83,4 @@ W.bandage() W.disinfect() H.UpdateDamageIcon() - playsound(src.loc, 'sound/effects/ointment.ogg', 25) \ No newline at end of file + playsound(src.loc, 'sound/effects/ointment.ogg', 25)