Adds a security_digi.dmi for uniforms (#14329)
* initial * moves this to donor sprites * digi-tizes sec * repath the sec utility * icon fix * NOW icon is fix
@@ -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{
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 75 KiB |
|
After Width: | Height: | Size: 86 KiB |
|
Before Width: | Height: | Size: 465 KiB After Width: | Height: | Size: 460 KiB |
|
Before Width: | Height: | Size: 581 KiB After Width: | Height: | Size: 505 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 155 KiB |
@@ -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 = "<i>\"You look lonely.\"</i>"
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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"
|
||||
|
||||