From 4e1cff4a67f3b2bd5185f8aa4f67cc89052ac6ae Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Wed, 7 Sep 2016 16:30:51 -0400 Subject: [PATCH 1/2] Ninja katanas are now immune to acid --- code/modules/ninja/energy_katana.dm | 4 ++-- code/modules/ninja/suit/gloves.dm | 1 + code/modules/ninja/suit/mask.dm | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 354d2f4db97..75490674b9a 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -6,6 +6,7 @@ force = 40 throwforce = 20 armour_penetration = 50 + unacidable = 1 var/datum/effect_system/spark_spread/spark_system /obj/item/weapon/katana/energy/afterattack(atom/target, mob/user, proximity_flag, click_parameters) @@ -37,7 +38,7 @@ /obj/item/weapon/katana/energy/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0) if(!istype(user)) return - loc = get_turf(src) + forceMove(get_turf(user)) if(doSpark) spark_system.start() @@ -50,7 +51,6 @@ else if(user.equip_to_slot_if_possible(src, slot_belt, 0, 1, 1)) msg = "Your Energy Katana teleports back to you, sheathing itself as it does so!" else - loc = get_turf(user) msg = "Your Energy Katana teleports to your location!" if(caught) diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm index 51b18f4c43a..5e441da8472 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -31,6 +31,7 @@ heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT strip_delay = 120 + unacidable = 1 var/draining = 0 var/candrain = 0 var/mindrain = 200 diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index f5c5b4dbd4c..ca549aab8e6 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -16,3 +16,4 @@ Contents: icon_state = "s-ninja" item_state = "s-ninja_mask" strip_delay = 120 + unacidable = 1 From c25d5048b1ff63bf2ce14bd906af9605c9aa0b39 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Wed, 7 Sep 2016 16:45:04 -0400 Subject: [PATCH 2/2] feedback --- code/modules/ninja/suit/head.dm | 3 ++- code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm | 1 + code/modules/ninja/suit/shoes.dm | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/ninja/suit/head.dm b/code/modules/ninja/suit/head.dm index 5707a1bd809..cb4921fd7df 100644 --- a/code/modules/ninja/suit/head.dm +++ b/code/modules/ninja/suit/head.dm @@ -8,4 +8,5 @@ armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25) strip_delay = 12 unacidable = 1 - blockTracking = 1//Roughly the only unique thing about this helmet. \ No newline at end of file + blockTracking = 1//Roughly the only unique thing about this helmet. + flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm index b77c67970e8..f76f974e647 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -23,5 +23,6 @@ reagents.trans_id_to(H, "radium", a_transfer) H << "You are beginning to feel the after-effect of the injection." a_boost-- + H << "There are [a_boost] adrenaline boosts remaining." s_coold = 3 return \ No newline at end of file diff --git a/code/modules/ninja/suit/shoes.dm b/code/modules/ninja/suit/shoes.dm index 732f8a37e8d..ca5761014bd 100644 --- a/code/modules/ninja/suit/shoes.dm +++ b/code/modules/ninja/suit/shoes.dm @@ -6,6 +6,7 @@ item_state = "secshoes" permeability_coefficient = 0.01 flags = NOSLIP + unacidable = 1 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) strip_delay = 120 cold_protection = FEET