From f3a865929e08603ea3985d301e85dde7b061d459 Mon Sep 17 00:00:00 2001 From: konushi Date: Thu, 18 Apr 2024 16:10:34 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D1=85?= =?UTF-8?q?=D0=B0=D1=80=D0=B4=D1=81=D1=8C=D1=8E=D1=82=D1=8B,=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BC=D0=BE=D0=B4=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RandomZLevels/spacebattle.dmm | 12 ++++------ modular_ss220/clothing/code/suits.dm | 22 ------------------- modular_ss220/maps220/code/mobs.dm | 2 +- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/_maps/map_files220/RandomZLevels/spacebattle.dmm b/_maps/map_files220/RandomZLevels/spacebattle.dmm index 870d2e58b8f2..dab9b6d78559 100644 --- a/_maps/map_files220/RandomZLevels/spacebattle.dmm +++ b/_maps/map_files220/RandomZLevels/spacebattle.dmm @@ -42,10 +42,8 @@ /turf/space, /area/space) "ag" = ( -/obj/machinery/suit_storage_unit{ - suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/damaged; - mask_type = /obj/item/clothing/mask/gas/syndicate; - boots_type = /obj/item/clothing/shoes/magboots/syndie +/obj/machinery/suit_storage_unit/syndicate{ + state_open = 1 }, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate) @@ -13696,10 +13694,8 @@ /turf/space, /area/space) "QC" = ( -/obj/machinery/suit_storage_unit{ - suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/damaged; - mask_type = /obj/item/clothing/mask/gas/syndicate; - boots_type = /obj/item/clothing/shoes/magboots/syndie +/obj/machinery/suit_storage_unit/syndicate{ + state_open = 1 }, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate1) diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm index 19b3da414fe0..9bbb86ddf2bc 100644 --- a/modular_ss220/clothing/code/suits.dm +++ b/modular_ss220/clothing/code/suits.dm @@ -212,28 +212,6 @@ containername = "soundhand fan crate" /* Space Battle */ -/obj/item/clothing/suit/space/hardsuit/syndi/damaged - name = "damged blood-red hardsuit" - desc = "Damaged advanced hardsuit designed for work in special operations. There are a many patches visible on the suit. Its mode switcher system looks damaged and forced in travel mode. Property of Gorlex Marauders." - armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 30, "rad" = 50, "fire" = 50, "acid" = 90) - w_class = WEIGHT_CLASS_NORMAL - on = 1 - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged - actions_types = list(/datum/action/item_action/toggle_helmet) - -/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged/attack_self(mob/user) //Toggle Helmet - if(!on) - to_chat(user, "You cant switch your hardsuit to combat mode.") - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1) - .=..() - -/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged - actions_types = list() - on = 1 - icon_state = "hardsuit1-syndi" - item_state = "syndie_helm" - actions_types = list(/datum/action/item_action/toggle_helmet_light) - /obj/item/clothing/suit/space/hardsuit/security icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "hardsuit-sec-old" diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm index 7d06a31b21e2..6b6b9a03e2e4 100644 --- a/modular_ss220/maps220/code/mobs.dm +++ b/modular_ss220/maps220/code/mobs.dm @@ -1385,7 +1385,7 @@ switch(rand(1,100)) // 1% if(1) - SynSpace = /obj/item/clothing/suit/space/hardsuit/syndi + SynSpace = /obj/item/mod/control/pre_equipped/nuclear else SynSpace = /obj/item/ammo_casing/c10mm return ..()