From 7c11ec86e57a3c1b054fa0ae681d571a2ec4a9c7 Mon Sep 17 00:00:00 2001 From: Geeves Date: Thu, 3 Sep 2020 00:38:12 +0200 Subject: [PATCH] Cargo Mech Fix (#9864) --- code/modules/heavy_vehicle/premade/_premade.dm | 12 ++++++++---- html/changelogs/geeves-forbidden_mechs.yml | 6 ++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/geeves-forbidden_mechs.yml diff --git a/code/modules/heavy_vehicle/premade/_premade.dm b/code/modules/heavy_vehicle/premade/_premade.dm index 9dfddfc9e9f..0698798febe 100644 --- a/code/modules/heavy_vehicle/premade/_premade.dm +++ b/code/modules/heavy_vehicle/premade/_premade.dm @@ -180,19 +180,23 @@ ) var/mech_colour = super_random ? FALSE : pick(use_colours) if(!arms) - var/armstype = pick(subtypesof(/obj/item/mech_component/manipulators)) + var/list/forbidden_arm_types = list(/obj/item/mech_component/manipulators/cult) + var/armstype = pick(subtypesof(/obj/item/mech_component/manipulators) - forbidden_arm_types) arms = new armstype(src) arms.color = mech_colour ? mech_colour : pick(use_colours) if(!legs) - var/legstype = pick(subtypesof(/obj/item/mech_component/propulsion)) + var/list/forbidden_leg_types = list(/obj/item/mech_component/propulsion/cult) + var/legstype = pick(subtypesof(/obj/item/mech_component/propulsion) - forbidden_leg_types) legs = new legstype(src) legs.color = mech_colour ? mech_colour : pick(use_colours) if(!head) - var/headtype = pick(subtypesof(/obj/item/mech_component/sensors)) + var/list/forbidden_head_types = list(/obj/item/mech_component/sensors/cult) + var/headtype = pick(subtypesof(/obj/item/mech_component/sensors) - forbidden_head_types) head = new headtype(src) head.color = mech_colour ? mech_colour : pick(use_colours) if(!body) - var/bodytype = pick(subtypesof(/obj/item/mech_component/chassis)) + var/list/forbidden_body_types = list(/obj/item/mech_component/chassis/cult) + var/bodytype = pick(subtypesof(/obj/item/mech_component/chassis) - forbidden_body_types) body = new bodytype(src) body.color = mech_colour ? mech_colour : pick(use_colours) update_icon() diff --git a/html/changelogs/geeves-forbidden_mechs.yml b/html/changelogs/geeves-forbidden_mechs.yml new file mode 100644 index 00000000000..c93e190b2d0 --- /dev/null +++ b/html/changelogs/geeves-forbidden_mechs.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Cargo mechs can no longer spawn with cult mech pieces." \ No newline at end of file