From a8c5ed79ce27f09a859f33103b14f089050050bc Mon Sep 17 00:00:00 2001 From: Nicaragua Date: Mon, 31 Dec 2018 13:07:04 -0300 Subject: [PATCH 1/7] Added to upgrade FireFighters with goliath plates Same with RIPLEY APLU, being able to upgrade it to improve its armor --- code/modules/mob/living/simple_animal/hostile/mining_mobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 0f37482b3e2..3fd9c645079 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -247,7 +247,7 @@ return if(istype(target, /obj/mecha/working/ripley)) var/obj/mecha/D = target - if(D.icon_state != "ripley-open") + if(D.icon_state != "ripley-open" && D.icon_state != "firefighter-open") to_chat(user, "You can't add armour onto the mech while someone is inside!") return var/list/damage_absorption = D.damage_absorption From 807fb3122384734289df2d81e118c07aadeb674d Mon Sep 17 00:00:00 2001 From: Nicaragua Date: Tue, 1 Jan 2019 14:37:52 -0300 Subject: [PATCH 2/7] Lazarus was not displaying any message when emagging --- code/modules/mining/equipment_locker.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 11bafb24e26..47bf9b17347 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -845,13 +845,15 @@ to_chat(user, "[src] is only effective on lesser beings.") return -/obj/item/lazarus_injector/emag_act() +/obj/item/lazarus_injector/emag_act(user as mob) if(!malfunctioning) malfunctioning = 1 + to_chat(user, "You override [src]'s safety protocols.") -/obj/item/lazarus_injector/emp_act() +/obj/item/lazarus_injector/emp_act(user as mob) if(!malfunctioning) malfunctioning = 1 + to_chat(user, "You override [src]'s safety protocols.") /obj/item/lazarus_injector/examine(mob/user) ..(user) From 3e29e98171d61c971c84cdb58046813430a97a63 Mon Sep 17 00:00:00 2001 From: Nicaragua Date: Tue, 1 Jan 2019 14:47:40 -0300 Subject: [PATCH 3/7] Wrong pull. Reverting changes I forgot to create a new branch. --- code/modules/mining/equipment_locker.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 47bf9b17347..11bafb24e26 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -845,15 +845,13 @@ to_chat(user, "[src] is only effective on lesser beings.") return -/obj/item/lazarus_injector/emag_act(user as mob) +/obj/item/lazarus_injector/emag_act() if(!malfunctioning) malfunctioning = 1 - to_chat(user, "You override [src]'s safety protocols.") -/obj/item/lazarus_injector/emp_act(user as mob) +/obj/item/lazarus_injector/emp_act() if(!malfunctioning) malfunctioning = 1 - to_chat(user, "You override [src]'s safety protocols.") /obj/item/lazarus_injector/examine(mob/user) ..(user) From 87d0229e2fa81a6ea02979e97d5c0f3c08553bdd Mon Sep 17 00:00:00 2001 From: Nicaragua Date: Tue, 1 Jan 2019 14:57:32 -0300 Subject: [PATCH 4/7] Lazarus wasnt showing any message when emmaging --- code/modules/mining/equipment_locker.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 11bafb24e26..92ca00868c6 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -845,13 +845,15 @@ to_chat(user, "[src] is only effective on lesser beings.") return -/obj/item/lazarus_injector/emag_act() +/obj/item/lazarus_injector/emag_act(mob/user) if(!malfunctioning) malfunctioning = 1 + to_chat(user, "You override [src]'s safety protocols.") -/obj/item/lazarus_injector/emp_act() +/obj/item/lazarus_injector/emp_act(mob/user) if(!malfunctioning) malfunctioning = 1 + to_chat(user, "You override [src]'s safety protocols.") /obj/item/lazarus_injector/examine(mob/user) ..(user) From f554e80706966bad43765f573b801375f2755ebf Mon Sep 17 00:00:00 2001 From: Nicaragua Date: Tue, 1 Jan 2019 15:06:31 -0300 Subject: [PATCH 5/7] Removing my old PR file from this My bad --- code/modules/mob/living/simple_animal/hostile/mining_mobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 3fd9c645079..0f37482b3e2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -247,7 +247,7 @@ return if(istype(target, /obj/mecha/working/ripley)) var/obj/mecha/D = target - if(D.icon_state != "ripley-open" && D.icon_state != "firefighter-open") + if(D.icon_state != "ripley-open") to_chat(user, "You can't add armour onto the mech while someone is inside!") return var/list/damage_absorption = D.damage_absorption From 655ee56bfca30d05590b65b9ad0a29f32ee9c6d9 Mon Sep 17 00:00:00 2001 From: Nicaragua Date: Tue, 1 Jan 2019 17:24:33 -0300 Subject: [PATCH 6/7] fixed emp_act shouldn't send a message removed --- code/modules/mining/equipment_locker.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 92ca00868c6..74e5f2c7845 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -845,15 +845,14 @@ to_chat(user, "[src] is only effective on lesser beings.") return -/obj/item/lazarus_injector/emag_act(mob/user) +/obj/item/lazarus_injector/emag_act() if(!malfunctioning) malfunctioning = 1 to_chat(user, "You override [src]'s safety protocols.") -/obj/item/lazarus_injector/emp_act(mob/user) +/obj/item/lazarus_injector/emp_act() if(!malfunctioning) malfunctioning = 1 - to_chat(user, "You override [src]'s safety protocols.") /obj/item/lazarus_injector/examine(mob/user) ..(user) From 1d1f89499ea1775363f5815c4b65961bbe97fe41 Mon Sep 17 00:00:00 2001 From: Nicaragua Date: Tue, 1 Jan 2019 23:07:09 -0300 Subject: [PATCH 7/7] Fixed --- code/modules/mining/equipment_locker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 74e5f2c7845..c8e95409947 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -845,7 +845,7 @@ to_chat(user, "[src] is only effective on lesser beings.") return -/obj/item/lazarus_injector/emag_act() +/obj/item/lazarus_injector/emag_act(mob/user) if(!malfunctioning) malfunctioning = 1 to_chat(user, "You override [src]'s safety protocols.")