From 347652e3b417a6c2228c74bc0656cd1ff76efb8a Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Sun, 14 Jul 2024 01:42:36 -0400 Subject: [PATCH] WIP --- code/modules/clothing/suits/marine_suit.dm | 62 ------- code/modules/clothing/suits/miscellaneous.dm | 170 ++----------------- code/modules/clothing/suits/rmc_suit.dm | 58 +++++++ code/modules/clothing/suits/weyland_suit.dm | 5 +- colonialmarines.dme | 6 +- 5 files changed, 77 insertions(+), 224 deletions(-) create mode 100644 code/modules/clothing/suits/rmc_suit.dm diff --git a/code/modules/clothing/suits/marine_suit.dm b/code/modules/clothing/suits/marine_suit.dm index 9490249b20..9674e69a20 100644 --- a/code/modules/clothing/suits/marine_suit.dm +++ b/code/modules/clothing/suits/marine_suit.dm @@ -1320,68 +1320,6 @@ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE contained_sprite = TRUE - -//=ROYAL MARINES=\\ - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine - name = "kestrel armoured vest" - desc = "A customizable personal armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." - icon_state = "rmc_light" - item_state = "rmc_light" - flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine/, - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/explosive/grenade, - /obj/item/storage/bible, - /obj/item/weapon/sword/machete, - /obj/item/attachable/bayonet, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - ) - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light //RMC Rifleman Armor - icon_state = "rmc_light" - item_state = "rmc_light" - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - slowdown = SLOWDOWN_ARMOR_LIGHT - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/team_leader //RMC TL & LT Armor - name = "kestrel armoured carry vest" - icon_state = "rmc_light_padded" - item_state = "rmc_light_padded" - storage_slots = 7 - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/smartgun //Smartgun Spec Armor - name = "kestrel armoured smartgun harness" - icon_state = "rmc_smartgun" - item_state = "rmc_smartgun" - flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman //Pointman Spec Armor - name = "kestrel pointman armour" - desc = "A heavier version of the armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." - icon_state = "rmc_pointman" - item_state = "rmc_pointman" - armor_melee = CLOTHING_ARMOR_HIGH - armor_bullet = CLOTHING_ARMOR_HIGHPLUS - armor_bomb = CLOTHING_ARMOR_HIGHPLUS - armor_bio = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - storage_slots = 7 - slowdown = SLOWDOWN_ARMOR_LOWHEAVY - movement_compensation = SLOWDOWN_ARMOR_MEDIUM - /atom/movable/marine_light light_system = DIRECTIONAL_LIGHT diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index db234f50c7..da40d78f5d 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1,14 +1,7 @@ /* - * Contains: * Lasertag - * Costume - * Misc */ - -/* - * Lasertag - */ -/obj/item/clothing/suit/bluetag +/obj/item/clothing/suit/lasertag name = "blue laser tag armor" desc = "Blue Pride, Station Wide." icon_state = "bluetag" @@ -27,46 +20,11 @@ ) siemens_coefficient = 3 -/obj/item/clothing/suit/redtag +/obj/item/clothing/suit/lasertag/red name = "red laser tag armor" desc = "Reputed to go faster." icon_state = "redtag" item_state = "redtag" - blood_overlay_type = "armor" - flags_armor_protection = BODY_FLAG_CHEST - allowed = list ( - /obj/item/weapon/gun, - - /obj/item/device/flashlight, - /obj/item/device/healthanalyzer, - /obj/item/device/radio, - /obj/item/tank/emergency_oxygen, - /obj/item/tool/crowbar, - /obj/item/tool/pen, - ) - siemens_coefficient = 3 - -/* - * Costume - */ -/obj/item/clothing/suit/pirate - name = "pirate coat" - desc = "Yarr." - icon_state = "pirate" - item_state = "pirate" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS - -/obj/item/clothing/suit/holidaypriest - name = "Holiday Priest" - desc = "This is a nice holiday my son." - icon_state = "holidaypriest" - item_state = "holidaypriest" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS - flags_inv_hide = HIDEJUMPSUIT - allowed = list( - /obj/item/weapon/gun, - ) - /obj/item/clothing/suit/cardborg name = "cardborg suit" @@ -76,10 +34,6 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN flags_inv_hide = HIDEJUMPSUIT -/* - * Misc - */ - /obj/item/clothing/suit/straight_jacket name = "straight jacket" desc = "A suit that completely restrains the wearer." @@ -124,35 +78,23 @@ /obj/item/device/motiondetector, ) -/obj/item/clothing/suit/storage/utility_vest +/obj/item/clothing/suit/storage/webbing/utility_vest name = "utility vest" desc = "A utility vest to hold tools in." icon_state = "synth_utility_vest" item_state = "synth_utility_vest" - allowed = list( - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/device/binoculars, - /obj/item/attachable/bayonet, - - /obj/item/storage/belt/gun/m4a3, - /obj/item/storage/belt/gun/m44, - /obj/item/storage/belt/gun/mateba, - /obj/item/storage/belt/gun/smartpistol, - /obj/item/weapon/gun, - /obj/item/device/flashlight, - /obj/item/device/healthanalyzer, - /obj/item/device/radio, - /obj/item/tool/crowbar, - /obj/item/tool/crew_monitor, - /obj/item/storage/large_holster/machete, - /obj/item/storage/large_holster/katana, - /obj/item/device/motiondetector, - ) +/obj/item/clothing/suit/xenos + name = "xenos suit" + desc = "A suit made out of chitinous alien hide." + icon_state = "xenos" + item_state = "xenos_helm" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS + flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + siemens_coefficient = 2 //Blue suit jacket toggle -/obj/item/clothing/suit/suit/verb/toggle() +/* /obj/item/clothing/suit/suit/verb/toggle() set name = "Toggle Jacket Buttons" set category = "Object" set src in usr @@ -171,90 +113,4 @@ else to_chat(usr, "You button-up some imaginary buttons on your [src].") return - update_clothing_icon() - -//pyjamas -//originally intended to be pinstripes >.> - -/obj/item/clothing/suit/xenos - name = "xenos suit" - desc = "A suit made out of chitinous alien hide." - icon_state = "xenos" - item_state = "xenos_helm" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - siemens_coefficient = 2 -//swimsuit -/obj/item/clothing/under/swimsuit - siemens_coefficient = 1 - flags_armor_protection = 0 - -/obj/item/clothing/under/swimsuit/black - name = "black swimsuit" - desc = "An old-fashioned black swimsuit." - icon_state = "swim_black" - siemens_coefficient = 1 - -/obj/item/clothing/under/swimsuit/blue - name = "blue swimsuit" - desc = "An old-fashioned blue swimsuit." - icon_state = "swim_blue" - siemens_coefficient = 1 - -/obj/item/clothing/under/swimsuit/purple - name = "purple swimsuit" - desc = "An old-fashioned purple swimsuit." - icon_state = "swim_purp" - siemens_coefficient = 1 - -/obj/item/clothing/under/swimsuit/green - name = "green swimsuit" - desc = "An old-fashioned green swimsuit." - icon_state = "swim_green" - siemens_coefficient = 1 - -/obj/item/clothing/under/swimsuit/red - name = "red swimsuit" - desc = "An old-fashioned red swimsuit." - icon_state = "swim_red" - siemens_coefficient = 1 - -/obj/item/clothing/suit/storage/bomber - name = "brown bomber jacket" - desc = "A well-worn leather bomber jacket." - icon_state = "bomber" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS - flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS - allowed = list ( - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/device/binoculars, - /obj/item/attachable/bayonet, - - /obj/item/storage/belt/gun/m4a3, - /obj/item/storage/belt/gun/m44, - /obj/item/storage/belt/gun/mateba, - /obj/item/storage/belt/gun/smartpistol, - /obj/item/weapon/gun, - - /obj/item/device/flashlight, - /obj/item/device/healthanalyzer, - /obj/item/device/radio, - /obj/item/tank/emergency_oxygen, - /obj/item/tool/crowbar, - /obj/item/tool/crew_monitor, - /obj/item/tool/pen, - /obj/item/storage/large_holster/machete, - /obj/item/storage/large_holster/katana, - /obj/item/device/motiondetector, - ) - min_cold_protection_temperature = T0C - siemens_coefficient = 0.7 - valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL) - restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) - -/obj/item/clothing/suit/storage/bomber/alt - name = "black bomber jacket" - icon_state = "bomber_2" + update_clothing_icon() */ diff --git a/code/modules/clothing/suits/rmc_suit.dm b/code/modules/clothing/suits/rmc_suit.dm new file mode 100644 index 0000000000..babc52bafe --- /dev/null +++ b/code/modules/clothing/suits/rmc_suit.dm @@ -0,0 +1,58 @@ +/obj/item/clothing/suit/storage/marine/veteran/royal_marine + name = "kestrel armoured vest" + desc = "A customizable personal armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." + icon_state = "rmc_light" + item_state = "rmc_light" + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/ammo_magazine/, + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/explosive/grenade, + /obj/item/storage/bible, + /obj/item/weapon/sword/machete, + /obj/item/attachable/bayonet, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + ) + +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light //RMC Rifleman Armor + icon_state = "rmc_light" + item_state = "rmc_light" + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + slowdown = SLOWDOWN_ARMOR_LIGHT + +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/team_leader //RMC TL & LT Armor + name = "kestrel armoured carry vest" + icon_state = "rmc_light_padded" + item_state = "rmc_light_padded" + storage_slots = 7 + +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/smartgun //Smartgun Spec Armor + name = "kestrel armoured smartgun harness" + icon_state = "rmc_smartgun" + item_state = "rmc_smartgun" + flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS + +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman //Pointman Spec Armor + name = "kestrel pointman armour" + desc = "A heavier version of the armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." + icon_state = "rmc_pointman" + item_state = "rmc_pointman" + armor_melee = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_HIGHPLUS + armor_bomb = CLOTHING_ARMOR_HIGHPLUS + armor_bio = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + storage_slots = 7 + slowdown = SLOWDOWN_ARMOR_LOWHEAVY + movement_compensation = SLOWDOWN_ARMOR_MEDIUM diff --git a/code/modules/clothing/suits/weyland_suit.dm b/code/modules/clothing/suits/weyland_suit.dm index e358235e32..e298ac3879 100644 --- a/code/modules/clothing/suits/weyland_suit.dm +++ b/code/modules/clothing/suits/weyland_suit.dm @@ -1,12 +1,9 @@ -//=============================//pmcS\\==================================\\ -//=======================================================================\\ - /obj/item/clothing/suit/storage/marine/veteran flags_marine_armor = ARMOR_LAMP_OVERLAY flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE //Let's make these keep their name and icon. /obj/item/clothing/suit/storage/marine/veteran/pmc - name = "\improper M4 pattern PMC armor" + name = "\improper X4 pattern PMC armor" desc = "A modification of the standard Armat Systems M3 armor. Designed for high-profile security operators and corporate mercenaries in mind." icon_state = "pmc_armor" armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH diff --git a/colonialmarines.dme b/colonialmarines.dme index c64e827ede..5f5a2abad0 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1555,13 +1555,17 @@ #include "code\modules\clothing\spacesuits\void.dm" #include "code\modules\clothing\suits\armor.dm" #include "code\modules\clothing\suits\bio.dm" +#include "code\modules\clothing\suits\civilian_suit.dm" #include "code\modules\clothing\suits\jobs.dm" #include "code\modules\clothing\suits\labcoat.dm" -#include "code\modules\clothing\suits\marine_armor.dm" #include "code\modules\clothing\suits\marine_coat.dm" +#include "code\modules\clothing\suits\marine_suit.dm" #include "code\modules\clothing\suits\miscellaneous.dm" +#include "code\modules\clothing\suits\rmc_suit.dm" #include "code\modules\clothing\suits\storage.dm" +#include "code\modules\clothing\suits\upp_suit.dm" #include "code\modules\clothing\suits\utility.dm" +#include "code\modules\clothing\suits\weyland_suit.dm" #include "code\modules\clothing\under\gimmick.dm" #include "code\modules\clothing\under\marine_uniform.dm" #include "code\modules\clothing\under\civilian_uniform.dm"