From c1bb4f3529dc844d444b492d32788e51fa603939 Mon Sep 17 00:00:00 2001 From: Waterpig Date: Tue, 21 Mar 2023 23:01:12 +0100 Subject: [PATCH 1/3] Update mecha.dm --- code/game/mecha/mecha.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c1c71f9ca6ec..dc411b0da16e 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1093,6 +1093,8 @@ update_icon() setDir(dir_in) log_message("[mmi_as_oc] moved in as pilot.", LOG_MECHA) + if(!istype(src, /obj/mecha/combat)) + REMOVE_TRAIT(occupant, TRAIT_PACIFISM, POSIBRAIN_TRAIT) if(istype(mmi_as_oc, /obj/item/mmi/posibrain)) //yogs start reminder to posibrain to not be shitlers to_chat(brainmob, "As a synthetic intelligence, you answer to all crewmembers and the AI.\n\ Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.") From e5a9936583f7263cd0fbd0ae27fb5db2f909c1c2 Mon Sep 17 00:00:00 2001 From: Waterpig Date: Thu, 30 Mar 2023 12:36:49 +0200 Subject: [PATCH 2/3] This --- code/game/mecha/equipment/tools/mining_tools.dm | 2 +- code/game/mecha/equipment/tools/work_tools.dm | 2 +- code/game/mecha/equipment/weapons/weapons.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index fa3407ce5e17..c4f23271d2cb 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -12,7 +12,7 @@ equip_cooldown = 15 energy_drain = 10 force = 15 - harmful = TRUE + harmful = FALSE /// Time in deciseconds it takes to drill var/drill_delay = 7 /// Affects if it can bust through reinforced walls (DRILL_HARDENED) diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 08a71e1ce52c..0c2b4f3862ec 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -11,7 +11,7 @@ /// How much damage does it apply when used var/dam_force = 20 var/obj/mecha/working/ripley/cargo_holder - harmful = TRUE + harmful = FALSE /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/can_attach(obj/mecha/working/ripley/M as obj) if(..()) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index e3571e5bd6b0..b28a02c69f34 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -160,7 +160,7 @@ energy_drain = 30 projectile = /obj/item/projectile/plasma/adv/mech fire_sound = 'sound/weapons/plasma_cutter.ogg' - harmful = TRUE + harmful = FALSE /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M) if(..()) //combat mech @@ -177,7 +177,7 @@ energy_drain = 30 projectile = /obj/item/projectile/kinetic/mech fire_sound = 'sound/weapons/kenetic_accel.ogg' - harmful = TRUE + harmful = FALSE //attachable to all mechas, like the plasma cutter /obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun/can_attach(obj/mecha/M) From c2efc145f4d4cbb1e7b496e90c336ec8d831963a Mon Sep 17 00:00:00 2001 From: Waterpig Date: Thu, 30 Mar 2023 12:36:57 +0200 Subject: [PATCH 3/3] Revert "Update mecha.dm" This reverts commit c1bb4f3529dc844d444b492d32788e51fa603939. --- code/game/mecha/mecha.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index dc411b0da16e..c1c71f9ca6ec 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1093,8 +1093,6 @@ update_icon() setDir(dir_in) log_message("[mmi_as_oc] moved in as pilot.", LOG_MECHA) - if(!istype(src, /obj/mecha/combat)) - REMOVE_TRAIT(occupant, TRAIT_PACIFISM, POSIBRAIN_TRAIT) if(istype(mmi_as_oc, /obj/item/mmi/posibrain)) //yogs start reminder to posibrain to not be shitlers to_chat(brainmob, "As a synthetic intelligence, you answer to all crewmembers and the AI.\n\ Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.")