diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index 626406a5204..b6c77d37ab1 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -58,7 +58,7 @@ "ag" = ( /obj/item/storage/belt/security/full, /obj/item/radio/headset/interdyne, -/obj/item/clothing/under/utility/sec/old/syndicate, +/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate, /obj/structure/closet/secure_closet{ icon_state = "sec"; name = "brig officer's locker"; @@ -761,7 +761,7 @@ }, /obj/item/storage/belt/security/full, /obj/item/radio/headset/interdyne, -/obj/item/clothing/under/utility/sec/old/syndicate, +/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate, /obj/item/storage/belt/security/webbing/ds, /obj/item/clothing/head/beret/sec/syndicate, /turf/open/floor/mineral/plastitanium, @@ -6071,7 +6071,7 @@ }, /obj/item/storage/belt/security/full, /obj/item/radio/headset/interdyne, -/obj/item/clothing/under/utility/sec/old/syndicate, +/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate, /obj/effect/turf_decal/delivery, /obj/structure/window/reinforced/survival_pod{ dir = 1 @@ -14568,7 +14568,7 @@ /obj/item/storage/belt/security/full, /obj/item/radio/headset/interdyne, /obj/item/clothing/suit/armor/vest/warden/syndicate, -/obj/item/clothing/under/utility/sec/old/syndicate, +/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate, /obj/structure/cable, /obj/item/clothing/head/sec/navywarden/syndicate, /obj/item/clothing/suit/armor/hos/trenchcoat{ diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm index a440e72c4c2..76b6c512923 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm @@ -3146,7 +3146,7 @@ /obj/item/storage/backpack/duffelbag, /obj/effect/decal/cleanable/dirt/dust, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/utility/sec, +/obj/item/clothing/under/rank/security/skyrat/utility/redsec, /obj/item/radio, /obj/item/clothing/shoes/winterboots, /turf/open/floor/iron, @@ -6622,7 +6622,7 @@ /obj/item/storage/backpack/satchel, /obj/effect/decal/cleanable/dirt/dust, /obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/under/utility/sec/old, +/obj/item/clothing/under/rank/security/skyrat/utility/redsec, /obj/item/radio, /obj/item/clothing/under/rank/rnd/roboticist/skyrat/sleek, /turf/open/floor/iron, diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm new file mode 100644 index 00000000000..77a5e7324fe --- /dev/null +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm @@ -0,0 +1,23 @@ +/obj/item/clothing/under/rank/security + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi' // Anything that was in the security.dmi, should be in the security_digi.dmi + +/obj/item/clothing/under/rank/security/skyrat + icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi' + +//DEBATE MOVING *ALL* SECURITY STUFF HERE? Even overrides, at least as a like, sub-file? + +/obj/item/clothing/under/rank/security/skyrat/utility + name = "security utility uniform" + desc = "A utility uniform worn by Lopland-certified Security officers." + icon_state = "util_sec" + can_adjust = FALSE + +/obj/item/clothing/under/rank/security/skyrat/utility/redsec + desc = "A utility uniform worn by trained Security officers." + icon_state = "util_sec_old" + can_adjust = FALSE + +/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate //MOVE ALL /SYNDICATES TO THE SYNDICATE.DM WHEN THE .dmi IS MADE (soon, after centcomm.dmi) + armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 40) //Same stats as the tactical turtleneck. + has_sensor = NO_SENSORS diff --git a/modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi b/modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi index ce3bcc640d6..00e92c834f7 100644 Binary files a/modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi differ diff --git a/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi b/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi index fb94dfc0ab5..9b5400ebe5d 100644 Binary files a/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi index 1942d12d66d..39979058e61 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi new file mode 100644 index 00000000000..359cc7bf744 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi index b95bf97e343..822a58b433d 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi index c1e86a3f663..618a8893710 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi index 4cc553d7769..9bc3832b1e6 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi index f5c5920bcaf..65d2eca1f98 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi and b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/under/security.dm b/modular_skyrat/modules/customization/modules/clothing/under/security.dm index 6e7c2f7229f..61836b01f3d 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/security.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/security.dm @@ -3,9 +3,9 @@ // DETECTIVE /obj/item/clothing/under/rank/security/detective/cowboy name = "blonde cowboy uniform" - desc = "A blue shirt with some cool cowboy socks. You dig." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + desc = "A blue shirt and dark jeans, with a pair of spurred cowboy boots to boot." + icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi' //Donator item-ish? See the /armorless one below it + worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi' icon_state = "cowboy_uniform" supports_variations_flags = NONE can_adjust = FALSE @@ -38,8 +38,8 @@ /obj/item/clothing/under/rank/security/detective/runner name = "runner sweater" desc = "\"You look lonely.\"" - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi' icon_state = "runner" supports_variations_flags = NONE can_adjust = FALSE diff --git a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm index d81f2c963af..9774884bc18 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm @@ -10,16 +10,3 @@ /obj/item/clothing/under/utility/syndicate armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 40) //Same stats as the tactical turtleneck. has_sensor = NO_SENSORS - -/obj/item/clothing/under/utility/sec - name = "security utility uniform" - desc = "A utility uniform worn by Security officers." - icon_state = "util_sec" - armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 30, ACID = 30, WOUND = 10) //Same stats as default security jumpsuit - -/obj/item/clothing/under/utility/sec/old //Oldsec (Red) - icon_state = "util_sec_old" - -/obj/item/clothing/under/utility/sec/old/syndicate - armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 40) //Same stats as the tactical turtleneck. - has_sensor = NO_SENSORS diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 9f936f5003d..0a6c56b18e8 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -199,7 +199,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/jumpsuit/utility_sec name = "Security Utility Uniform" - item_path = /obj/item/clothing/under/utility/sec + item_path = /obj/item/clothing/under/rank/security/skyrat/utility restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_BLUESHIELD, JOB_SECURITY_MEDIC, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) //i dunno about the blueshield, they're a weird combo of sec and command, thats why they arent in the loadout pr im making /datum/loadout_item/under/jumpsuit/utility_com diff --git a/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm b/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm index 8a2301e018a..e7bc3e883a3 100644 --- a/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm +++ b/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm @@ -39,7 +39,7 @@ ears = /obj/item/radio/headset/interdyne /datum/outfit/lavaland_syndicate/comms - uniform = /obj/item/clothing/under/utility/sec/old/syndicate + uniform = /obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate ears = /obj/item/radio/headset/interdyne/comms /datum/outfit/lavaland_syndicate/comms/space diff --git a/modular_skyrat/modules/mapping/code/mob_spawns.dm b/modular_skyrat/modules/mapping/code/mob_spawns.dm index ab4758f0763..d19a34aa906 100644 --- a/modular_skyrat/modules/mapping/code/mob_spawns.dm +++ b/modular_skyrat/modules/mapping/code/mob_spawns.dm @@ -351,8 +351,8 @@ /datum/outfit/tarkon/sec name = "Port Tarkon Security Outfit" - uniform = /obj/item/clothing/under/utility/sec - glasses = /obj/item/clothing/glasses/hud/security + uniform = /obj/item/clothing/under/rank/security/skyrat/utility/redsec + glasses = /obj/item/clothing/glasses/hud/security/redsec gloves = /obj/item/clothing/gloves/tackler/combat id = /obj/item/card/id/away/tarkon/sec l_pocket = /obj/item/melee/baton/telescopic diff --git a/modular_skyrat/modules/sec_haul/code/misc/vending.dm b/modular_skyrat/modules/sec_haul/code/misc/vending.dm index 4c584183b29..0c97313a410 100644 --- a/modular_skyrat/modules/sec_haul/code/misc/vending.dm +++ b/modular_skyrat/modules/sec_haul/code/misc/vending.dm @@ -106,7 +106,7 @@ /obj/item/clothing/mask/bandana/red = 3, /obj/item/clothing/gloves/color/black = 3, /obj/item/clothing/under/rank/security/officer/skirt = 3, - /obj/item/clothing/under/utility/sec/old = 3, + /obj/item/clothing/under/rank/security/skyrat/utility/redsec = 3, /obj/item/clothing/suit/toggle/jacket/sec/old = 3, ) premium = list( /obj/item/clothing/under/rank/security/officer/formal = 5, diff --git a/tgstation.dme b/tgstation.dme index 211831b03f6..f151572d89f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4719,6 +4719,7 @@ #include "modular_skyrat\master_files\code\modules\clothing\under\jobs\engineering.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\jobs\medical.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\jobs\rnd.dm" +#include "modular_skyrat\master_files\code\modules\clothing\under\jobs\security.dm" #include "modular_skyrat\master_files\code\modules\events\spacevine.dm" #include "modular_skyrat\master_files\code\modules\experisci\experiment\handlers\experiment_handler.dm" #include "modular_skyrat\master_files\code\modules\jobs\departments\departments.dm"