cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-15 18:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hat path updates (#16753)

Browse Source 
* ew

* wew

* wew

* Update loadout_datum_heads.dm

* wew

* e
This commit is contained in:
Gandalf
2022-10-10 14:12:36 +01:00
committed by GitHub
parent d88ba560a2
commit f0aa91940a
24 changed files with 213 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
+2 -6
View File
@@ -7291,10 +7291,6 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"zh" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"zi" = (
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/skyrat/interdynefob/medbay/chem)
@@ -14475,7 +14471,7 @@
/obj/item/clothing/suit/armor/vest/warden/syndicate,
/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate,
/obj/structure/cable,
/obj/item/clothing/head/sec/navywarden/syndicate,
/obj/item/clothing/head/beret/sec/navywarden/syndicate,
/obj/item/clothing/suit/armor/hos/trenchcoat{
armor = list("melee"=35,"bullet"=30,"laser"=30,"energy"=40,"bomb"=25,"bio"=0,"fire"=50,"acid"=50,"wound"=10);
desc = "A trenchcoat enhanced with a special lightweight kevlar. It has little Syndicate logos sewn onto the shoulder badges with the letters 'MAA' just under it.";
@@ -18293,7 +18289,7 @@ mc
mc
Aq
Ui
zh
rf
tI
Aq
Ug
_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
+2 -2
View File
@@ -4628,8 +4628,8 @@
/obj/effect/turf_decal/bot,
/obj/item/clothing/accessory/maidapron,
/obj/item/clothing/accessory/maidapron,
/obj/item/clothing/head/maid,
/obj/item/clothing/head/maid,
/obj/item/clothing/head/costume/maid,
/obj/item/clothing/head/costume/maid,
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/under/costume/maid,
/turf/open/floor/iron/white,
_maps/map_files/Blueshift/BlueShift_middle.dmm
+2 -2
View File
@@ -7531,7 +7531,7 @@
/obj/item/clothing/suit/armor/hos/trenchcoat/peacekeeper,
/obj/item/clothing/suit/armor/hos/trenchcoat/peacekeeper/cloak,
/obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial,
/obj/item/clothing/head/imperial/hos,
/obj/item/clothing/head/hats/imperial/hos,
/obj/item/clothing/suit/armor/hos/navyblue,
/obj/item/clothing/shoes/cowboy/black,
/obj/item/clothing/head/hats/hos,
@@ -70131,7 +70131,7 @@
/obj/item/clothing/under/rank/engineering/chief_engineer/skirt,
/obj/item/clothing/under/rank/engineering/chief_engineer,
/obj/item/clothing/under/rank/engineering/chief_engineer/skyrat/imperial,
/obj/item/clothing/head/imperial/ce,
/obj/item/clothing/head/hats/imperial/ce,
/obj/item/clothing/head/utility/hardhat/weldhat/white,
/obj/item/clothing/suit/hooded/wintercoat/engineering/ce,
/obj/item/clothing/neck/cloak/ce,
_maps/map_files/Blueshift/BlueShift_upper.dmm
+6 -6
View File
@@ -18744,7 +18744,7 @@
/obj/item/clothing/under/rank/captain/parade,
/obj/item/clothing/suit/hooded/wintercoat/captain,
/obj/item/clothing/under/rank/captain/skyrat/imperial,
/obj/item/clothing/head/imperial/cap,
/obj/item/clothing/head/hats/imperial/cap,
/obj/item/clothing/neck/cloak/cap,
/obj/item/clothing/head/caphat/beret,
/obj/item/clothing/head/caphat/beret/alt,
@@ -21928,7 +21928,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/head/rabbitears,
/obj/item/clothing/head/costume/rabbitears,
/obj/machinery/light/small/broken/directional/west,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
@@ -35169,7 +35169,7 @@
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit,
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt,
/obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/imperial,
/obj/item/clothing/head/imperial/hop,
/obj/item/clothing/head/hats/imperial/hop,
/obj/item/clothing/head/hats/hopcap,
/obj/item/clothing/head/hopcap/beret/alt,
/obj/item/clothing/head/hopcap/beret,
@@ -46077,8 +46077,8 @@
/obj/item/clothing/under/costume/maid,
/obj/item/clothing/accessory/maidapron,
/obj/item/clothing/accessory/maidapron,
/obj/item/clothing/head/maid,
/obj/item/clothing/head/maid,
/obj/item/clothing/head/costume/maid,
/obj/item/clothing/head/costume/maid,
/obj/item/clothing/under/suit/tuxedo,
/obj/item/clothing/under/suit/tuxedo,
/obj/item/clothing/under/suit/waiter,
@@ -47375,7 +47375,7 @@
"pZY" = (
/obj/structure/table,
/obj/item/clothing/shoes/russian,
/obj/item/clothing/head/whiterussian{
/obj/item/clothing/head/costume/whiterussian{
pixel_y = 6
},
/turf/open/floor/plating,
_maps/shuttles/starfury_corvette.dmm
+3
View File
@@ -120,6 +120,7 @@
"ao" = (
/obj/machinery/light/small/directional/west{
brightness = 3;
},
/obj/structure/chair/comfy/shuttle{
dir = 1;
@@ -318,6 +319,7 @@
"aR" = (
/obj/machinery/light/small/directional/west{
brightness = 3;
},
/obj/structure/chair/comfy/shuttle{
name = "tactical chair"
@@ -354,6 +356,7 @@
"aU" = (
/obj/machinery/light/small/directional/west{
brightness = 3;
},
/obj/effect/turf_decal/siding/thinplating_new/dark,
/obj/effect/turf_decal/siding/thinplating_new/dark{
_maps/shuttles/starfury_fighter1.dmm
+1
View File
@@ -51,6 +51,7 @@
/obj/item/multitool,
/obj/machinery/light/small/directional/west{
brightness = 3;
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/sbc_fighter1)
modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm
+6 -6
View File
@@ -9,7 +9,7 @@
/obj/item/clothing/head/helmet/gladiator
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/chefhat
/obj/item/clothing/head/utility/chefhat
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/hos/beret
@@ -39,13 +39,13 @@
/obj/item/clothing/head/beret/blueshield
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/caphat
/obj/item/clothing/head/hats/caphat
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/crown/fancy
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/hopcap
/obj/item/clothing/head/hats/hopcap
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/utility/hardhat
@@ -84,16 +84,16 @@
/obj/item/clothing/head/fedora
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/that
/obj/item/clothing/head/hats/tophat
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/rabbitears
/obj/item/clothing/head/costume/rabbitears
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/mailman
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/centhat
/obj/item/clothing/head/hats/centhat
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/nursehat
modular_skyrat/modules/command_vendor/code/vending.dm
+15 -15
View File
@@ -12,16 +12,16 @@
/obj/machinery/vending/access/command/build_access_list(list/access_lists)
access_lists["[ACCESS_CAPTAIN]"] = list(
// CAPTAIN
/obj/item/clothing/head/caphat = 1,
/obj/item/clothing/head/hats/caphat = 1,
/obj/item/clothing/head/caphat/beret = 1,
/obj/item/clothing/head/caphat/beret/alt = 1,
/obj/item/clothing/head/imperial/cap = 1,
/obj/item/clothing/head/hats/imperial/cap = 1,
/obj/item/clothing/under/rank/captain = 1,
/obj/item/clothing/under/rank/captain/skirt = 1,
/obj/item/clothing/under/rank/captain/dress = 1,
/obj/item/clothing/under/rank/captain/skyrat/kilt = 1,
/obj/item/clothing/under/rank/captain/skyrat/imperial = 1,
/obj/item/clothing/head/caphat/parade = 1,
/obj/item/clothing/head/hats/caphat/parade = 1,
/obj/item/clothing/under/rank/captain/parade = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/captains_formal = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/jacket = 1,
@@ -48,10 +48,10 @@
/obj/item/clothing/shoes/laceup = 1
)
access_lists["[ACCESS_HOP]"] = list( // Best head btw
/obj/item/clothing/head/hopcap = 1,
/obj/item/clothing/head/hats/hopcap = 1,
/obj/item/clothing/head/hopcap/beret = 1,
/obj/item/clothing/head/hopcap/beret/alt = 1,
/obj/item/clothing/head/imperial/hop = 1,
/obj/item/clothing/head/hats/imperial/hop = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/skirt = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck = 1,
@@ -69,7 +69,7 @@
access_lists["[ACCESS_CMO]"] = list(
/obj/item/clothing/head/beret/medical/cmo = 1,
/obj/item/clothing/head/beret/medical/cmo/alt = 1,
/obj/item/clothing/head/imperial/cmo = 1,
/obj/item/clothing/head/hats/imperial/cmo = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck = 1,
@@ -96,7 +96,7 @@
access_lists["[ACCESS_CE]"] = list(
/obj/item/clothing/head/beret/engi/ce = 1,
/obj/item/clothing/head/beret/engi/ce/alt = 1,
/obj/item/clothing/head/imperial/ce = 1,
/obj/item/clothing/head/hats/imperial/ce = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/skirt = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/skyrat/imperial = 1,
@@ -106,8 +106,8 @@
access_lists["[ACCESS_HOS]"] = list(
/obj/item/clothing/head/hos = 1,
/obj/item/clothing/head/hos/beret/navyhos = 1,
/obj/item/clothing/head/hos/peacekeeper/sol = 1,
/obj/item/clothing/head/imperial/hos = 1,
/obj/item/clothing/head/hats/hos/peacekeeper/sol = 1,
/obj/item/clothing/head/hats/imperial/hos = 1,
/obj/item/clothing/under/rank/security/head_of_security/peacekeeper = 1,
/obj/item/clothing/under/rank/security/head_of_security/peacekeeper/sol = 1,
/obj/item/clothing/under/rank/security/head_of_security/alt = 1,
@@ -142,16 +142,16 @@
/obj/item/clothing/head/beret/centcom_formal/nt_consultant = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant/skirt = 1,
/obj/item/clothing/head/centhat = 1,
/obj/item/clothing/head/hats/centhat = 1,
/obj/item/clothing/suit/armor/centcom_formal/nt_consultant = 1
)
access_lists["[ACCESS_COMMAND]"] = list(
/obj/item/clothing/head/imperial = 5,
/obj/item/clothing/head/imperial/grey = 5,
/obj/item/clothing/head/imperial/white = 2,
/obj/item/clothing/head/imperial/red = 5,
/obj/item/clothing/head/imperial/helmet = 5,
/obj/item/clothing/head/hats/imperial = 5,
/obj/item/clothing/head/hats/imperial/grey = 5,
/obj/item/clothing/head/hats/imperial/white = 2,
/obj/item/clothing/head/hats/imperial/red = 5,
/obj/item/clothing/head/hats/imperial/helmet = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/grey = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants = 5,
modular_skyrat/modules/customization/modules/clothing/head/head.dm
+62 -63
View File
@@ -1,4 +1,4 @@
/obj/item/clothing/head/flakhelm //Actually the M1 Helmet
/obj/item/clothing/head/hats/flakhelm //Actually the M1 Helmet
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
name = "flak helmet"
@@ -8,7 +8,7 @@
desc = "A dilapidated helmet used in ancient wars. This one is brittle and essentially useless. An ace of spades is tucked into the band around the outer shell."
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/flakhelm/Initialize(mapload)
/obj/item/clothing/head/hats/flakhelm/Initialize(mapload)
. = ..()
create_storage(type = /datum/storage/pockets/tiny/spacenam)
@@ -16,7 +16,7 @@
/datum/storage/pockets/tiny/spacenam
attack_hand_interact = TRUE //So you can actually see what you stuff in there
/obj/item/clothing/head/cowboyhat
/obj/item/clothing/head/costume/cowboyhat
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
name = "cowboy hat"
@@ -25,25 +25,25 @@
inhand_icon_state = "cowboyhat"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/cowboyhat/black
/obj/item/clothing/head/costume/cowboyhat/black
name = "black cowboy hat"
desc = "A black cowboy hat, perfect for any outlaw"
icon_state = "cowboyhat_black"
inhand_icon_state = "cowboyhat_black"
/obj/item/clothing/head/cowboyhat/white
/obj/item/clothing/head/costume/cowboyhat/white
name = "white cowboy hat"
desc = "A white cowboy hat, perfect for your every day rancher"
icon_state = "cowboyhat_white"
inhand_icon_state = "cowboyhat_white"
/obj/item/clothing/head/cowboyhat/pink
/obj/item/clothing/head/costume/cowboyhat/pink
name = "pink cowboy hat"
desc = "A pink cowboy? more like cowgirl hat, just don't be a buckle bunny."
icon_state = "cowboyhat_pink"
inhand_icon_state = "cowboyhat_pink"
/obj/item/clothing/head/cowboyhat/sec
/obj/item/clothing/head/costume/cowboyhat/sec
name = "security cowboy hat"
desc = "A security cowboy hat, perfect for any true lawman"
icon_state = "cowboyhat_black"
@@ -51,7 +51,7 @@
// same armour as the sec beret
armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 20, ACID = 50, WOUND = 4)
/obj/item/clothing/head/kepi
/obj/item/clothing/head/costume/kepi
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
name = "kepi"
@@ -59,11 +59,11 @@
icon_state = "kepi"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/kepi/old
/obj/item/clothing/head/costume/kepi/old
icon_state = "kepi_old"
desc = "A flat, white circular cap with a visor, that demands some honor from it's wearer."
/obj/item/clothing/head/maid
/obj/item/clothing/head/costume/maid
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
name = "maid headband"
@@ -81,10 +81,10 @@
icon_state = "cyberpunkgoggle"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/intern/developer
/obj/item/clothing/head/hats/intern/developer
name = "intern beancap"
/obj/item/clothing/head/sec/navywarden/syndicate
/obj/item/clothing/head/beret/sec/navywarden/syndicate
name = "master at arms' beret"
desc = "Surprisingly stylish, if you lived in a silent impressionist film."
greyscale_config = /datum/greyscale_config/beret_badge
@@ -96,7 +96,7 @@
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/cowboyhat/blackwide
/obj/item/clothing/head/costume/cowboyhat/blackwide
name = "wide brimmed black cowboy hat"
desc = "The Man in Black, he walked the earth but is now six foot under, this hat a stark reminder. Bring your courage, your righteousness... measure it against my resolve, and you will fail."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
@@ -105,7 +105,7 @@
inhand_icon_state= "cowboy_black"
/obj/item/clothing/head/cowboyhat/wide
/obj/item/clothing/head/costume/cowboyhat/wide
name = "wide-brimmed cowboy hat"
desc = "A brown cowboy hat for blocking out the sun. Remember: Justice is truth in action. Let that guide you in the coming days."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
@@ -113,7 +113,7 @@
icon_state = "cowboy_wide"
inhand_icon_state= "cowboy_wide"
/obj/item/clothing/head/cowboyhat/wide/sec
/obj/item/clothing/head/costume/cowboyhat/wide/sec
name = "wide-brimmed security cowboy hat"
desc = "A bandit turned sheriff, his enforcement is brutal but effective - whether out of fear or respect is unclear, though not many bodies hang high. A peaceful land, a quiet people."
icon_state = "cowboy_black"
@@ -121,6 +121,33 @@
// same armour as the sec beret
armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 20, ACID = 50, WOUND = 4)
/obj/item/clothing/head/costume/cowboyhat/sheriff
name = "winter cowboy hat"
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "sheriff_hat"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
desc = "A dark hat from the cold wastes of the Frosthill mountains. So it was done, all according to the law. There's a small set of antlers embroidered on the inside."
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
flags_inv = HIDEHAIR | SHOWSPRITEEARS
/obj/item/clothing/head/costume/cowboyhat/sheriff/alt
name = "sheriff hat"
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "sheriff_hat_alt"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
desc = "A dark brown hat with a smell of whiskey. There's a small set of antlers embroidered on the inside."
flags_inv = SHOWSPRITEEARS
/obj/item/clothing/head/costume/cowboyhat/deputy
name = "deputy hat"
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "deputy_hat"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
desc = "A light brown hat with a smell of iron. There's a small set of antlers embroidered on the inside."
/obj/item/clothing/head/costume/ushanka/sec
name = "security ushanka"
@@ -162,7 +189,7 @@
soft_type = "enclaveo"
dog_fashion = null
/obj/item/clothing/head/whiterussian
/obj/item/clothing/head/costume/whiterussian
name = "papakha"
desc = "A big wooly clump of fur designed to go on your head."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
@@ -173,19 +200,19 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/whiterussian/white
/obj/item/clothing/head/costume/whiterussian/white
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "papakha_white"
dog_fashion = null
/obj/item/clothing/head/whiterussian/black
/obj/item/clothing/head/costume/whiterussian/black
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "papakha_kuban"
dog_fashion = null
/obj/item/clothing/head/sec/peacekeeper/sol
/obj/item/clothing/head/hats/sec/peacekeeper/sol
name = "sol police cap"
desc = "Be a proper boy in blue with this cap, comes with a black visor to block out inconvenient truths."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
@@ -193,7 +220,7 @@
icon_state = "policeofficercap"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/hos/peacekeeper/sol
/obj/item/clothing/head/hats/hos/peacekeeper/sol
name = "sol police chief cap"
desc = "A blue hat adorned with gold, rumoured to be used to distract Agents with its swag."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
@@ -201,7 +228,7 @@
icon_state = "policechiefcap"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/sec/peacekeeper/sol/traffic
/obj/item/clothing/head/hats/sec/peacekeeper/sol/traffic
name = "sol traffic cop cap"
desc = "You think that's Shitcurrity? That's just Civil Shitsputes, I'll show you REAL Shitcurrity."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
@@ -219,7 +246,7 @@
flags_1 = IS_PLAYER_COLORABLE_1
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/flowerpin
/obj/item/clothing/head/costume/flowerpin
name = "flower pin"
desc = "A small, colourable flower pin"
icon_state = "flowerpin"
@@ -230,7 +257,7 @@
w_class = WEIGHT_CLASS_SMALL
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/imperial
/obj/item/clothing/head/hats/imperial
name = "grey naval officer cap"
desc = "A grey naval cap with a silver disk in the center."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
@@ -238,41 +265,41 @@
icon_state = "impcom"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/imperial/grey
/obj/item/clothing/head/hats/imperial/grey
name = "dark grey naval officer cap"
desc = "A dark grey naval cap with a silver disk in the center."
icon_state = "impcommand"
/obj/item/clothing/head/imperial/red
/obj/item/clothing/head/hats/imperial/red
name = "red naval officer cap"
desc = "A red naval cap with a silver disk in the center."
icon_state = "impcap_red"
/obj/item/clothing/head/imperial/white
/obj/item/clothing/head/hats/imperial/white
name = "white naval officer cap"
desc = "A white naval cap with a silver disk in the center."
icon_state = "impcap"
/obj/item/clothing/head/imperial/cap
/obj/item/clothing/head/hats/imperial/cap
name = "captain's naval officer cap"
desc = "A white naval cap with a silver disk in the center."
icon_state = "impcap"
/obj/item/clothing/head/imperial/hop
/obj/item/clothing/head/hats/imperial/hop
name = "head of personnel's naval officer cap"
desc = "An olive naval cap with a silver disk in the center."
icon_state = "imphop"
/obj/item/clothing/head/imperial/hos
/obj/item/clothing/head/hats/imperial/hos
name = "head of security's naval officer cap"
desc = "A tar black naval cap with a silver disk in the center."
icon_state = "imphos"
/obj/item/clothing/head/imperial/cmo
/obj/item/clothing/head/hats/imperial/cmo
name = "chief medical officer's naval cap"
desc = "A teal naval cap with a silver disk in the center."
icon_state = "impcmo"
/obj/item/clothing/head/imperial/ce
/obj/item/clothing/head/hats/imperial/ce
name = "chief engineer's blast helmet"
desc = "Despite seeming like it's made of metal, it's actually a very cheap plastic.."
armor = list(MELEE = 15, BULLET = 5, LASER = 20, ENERGY = 10, BOMB = 20, BIO = 10, FIRE = 100, ACID = 50, WOUND = 10)
@@ -285,7 +312,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
/obj/item/clothing/head/imperial/helmet
/obj/item/clothing/head/hats/imperial/helmet
name = "blast helmet"
desc = "A sharp helmet with some goggles on the top. Unfortunately, both those and the helmet itself are made of flimsy plastic." //No armor moment
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
@@ -293,7 +320,7 @@
icon_state = "blast_helmet"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/imperial/helmet/Initialize(mapload)
/obj/item/clothing/head/hats/imperial/helmet/Initialize(mapload)
. = ..()
AddComponent(/datum/component/toggle_icon, "goggles")
@@ -304,34 +331,6 @@
icon_state = "enhead"
supports_variations_flags = NONE
/obj/item/clothing/head/cowboyhat/sheriff
name = "winter cowboy hat"
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "sheriff_hat"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
desc = "A dark hat from the cold wastes of the Frosthill mountains. So it was done, all according to the law. There's a small set of antlers embroidered on the inside."
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
flags_inv = HIDEHAIR | SHOWSPRITEEARS
/obj/item/clothing/head/cowboyhat/sheriff/alt
name = "sheriff hat"
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "sheriff_hat_alt"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
desc = "A dark brown hat with a smell of whiskey. There's a small set of antlers embroidered on the inside."
flags_inv = SHOWSPRITEEARS
/obj/item/clothing/head/cowboyhat/deputy
name = "deputy hat"
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "deputy_hat"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
desc = "A light brown hat with a smell of iron. There's a small set of antlers embroidered on the inside."
/obj/item/clothing/head/soft/yankee
name = "fashionable baseball cap"
desc = "Rimmed and brimmed."
@@ -366,14 +365,14 @@
icon_state = "blfedora"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/christmas
/obj/item/clothing/head/costume/christmas
name = "red christmas hat"
desc = "A red Christmas Hat! How festive!"
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "christmashat"
/obj/item/clothing/head/christmas/green
/obj/item/clothing/head/costume/christmas/green
name = "green christmas hat"
desc = "A green Christmas Hat! How festive!"
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
modular_skyrat/modules/customization/modules/clothing/head/trek.dm
+5 -5
View File
@@ -1,5 +1,5 @@
//Trekkie Caps
/obj/item/clothing/head/caphat/parade/fedcap
/obj/item/clothing/head/hats/caphat/parade/fedcap
name = "Federation officer's cap"
desc = "An officer's cap that demands discipline from the one who wears it."
icon_state = "fedcapofficer"
@@ -8,14 +8,14 @@
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
//Variants
/obj/item/clothing/head/caphat/parade/fedcap/medsci
/obj/item/clothing/head/hats/caphat/parade/fedcap/medsci
icon_state = "fedcapsci"
/obj/item/clothing/head/caphat/parade/fedcap/eng
/obj/item/clothing/head/hats/caphat/parade/fedcap/eng
icon_state = "fedcapeng"
/obj/item/clothing/head/caphat/parade/fedcap/sec
/obj/item/clothing/head/hats/caphat/parade/fedcap/sec
icon_state = "fedcapsec"
/obj/item/clothing/head/caphat/parade/fedcap/black
/obj/item/clothing/head/hats/caphat/parade/fedcap/black
icon_state = "fedcapblack"
modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm
+40 -40
View File
@@ -182,7 +182,7 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/rabbit_ears
name = "Rabbit Ears"
item_path = /obj/item/clothing/head/rabbitears
item_path = /obj/item/clothing/head/costume/rabbitears
/datum/loadout_item/head/bandana
name = "Bandana"
@@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/top_hat
name = "Top Hat"
item_path = /obj/item/clothing/head/that
item_path = /obj/item/clothing/head/hats/tophat
/datum/loadout_item/head/bowler_hat
name = "Bowler Hat"
@@ -243,12 +243,12 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/christmas
name = "Red Christmas Hat"
item_path = /obj/item/clothing/head/christmas
item_path = /obj/item/clothing/head/costume/christmas
required_season = CHRISTMAS
/datum/loadout_item/head/christmas/green
name = "Green Christmas Hat"
item_path = /obj/item/clothing/head/christmas/green
item_path = /obj/item/clothing/head/costume/christmas/green
required_season = CHRISTMAS
/*
@@ -297,7 +297,7 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/flowerpin
name = "Flower Pin"
item_path = /obj/item/clothing/head/flowerpin
item_path = /obj/item/clothing/head/costume/flowerpin
/datum/loadout_item/head/rice_hat
name = "Rice Hat"
@@ -310,15 +310,15 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/wrussian
name = "Black Papakha"
item_path = /obj/item/clothing/head/whiterussian
item_path = /obj/item/clothing/head/costume/whiterussian
/datum/loadout_item/head/wrussianw
name = "White Papakha"
item_path = /obj/item/clothing/head/whiterussian/white
item_path = /obj/item/clothing/head/costume/whiterussian/white
/datum/loadout_item/head/wrussianb
name = "Black and Red Papakha"
item_path = /obj/item/clothing/head/whiterussian/black
item_path = /obj/item/clothing/head/costume/whiterussian/black
/datum/loadout_item/head/slime
name = "Slime Hat"
@@ -326,19 +326,19 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/flakhelm
name = "Flak Helmet"
item_path = /obj/item/clothing/head/flakhelm
item_path = /obj/item/clothing/head/hats/flakhelm
/datum/loadout_item/head/whitekepi
name = "White Kepi"
item_path = /obj/item/clothing/head/kepi
item_path = /obj/item/clothing/head/costume/kepi
/datum/loadout_item/head/whitekepiold
name = "White Kepi (Old)"
item_path = /obj/item/clothing/head/kepi/old
item_path = /obj/item/clothing/head/costume/kepi/old
/datum/loadout_item/head/maidhead
name = "Simple Maid Headband"
item_path = /obj/item/clothing/head/maid
item_path = /obj/item/clothing/head/costume/maid
additional_tooltip_contents = list("Small headband that only fits on top the head.")
/datum/loadout_item/head/maidhead2
@@ -377,39 +377,39 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/cowboyhat
name = "Cowboy Hat (Brown)"
item_path = /obj/item/clothing/head/cowboyhat
item_path = /obj/item/clothing/head/costume/cowboyhat
/datum/loadout_item/head/cowboyhat_black
name = "Cowboy Hat (Black)"
item_path = /obj/item/clothing/head/cowboyhat/black
item_path = /obj/item/clothing/head/costume/cowboyhat/black
/datum/loadout_item/head/cowboyhat_blackwide
name = "Wide Cowboy Hat (Black)"
item_path = /obj/item/clothing/head/cowboyhat/blackwide
item_path = /obj/item/clothing/head/costume/cowboyhat/blackwide
/datum/loadout_item/head/cowboyhat_wide
name = "Wide Cowboy Hat (Brown)"
item_path = /obj/item/clothing/head/cowboyhat/wide
item_path = /obj/item/clothing/head/costume/cowboyhat/wide
/datum/loadout_item/head/cowboyhat_white
name = "Cowboy Hat (White)"
item_path = /obj/item/clothing/head/cowboyhat/white
item_path = /obj/item/clothing/head/costume/cowboyhat/white
/datum/loadout_item/head/cowboyhat_pink
name = "Cowboy Hat (Pink)"
item_path = /obj/item/clothing/head/cowboyhat/pink
item_path = /obj/item/clothing/head/costume/cowboyhat/pink
/datum/loadout_item/head/cowboyhat_winter
name = "Winter Cowboy Hat"
item_path = /obj/item/clothing/head/cowboyhat/sheriff
item_path = /obj/item/clothing/head/costume/cowboyhat/sheriff
/datum/loadout_item/head/cowboyhat_sheriff
name = "Sheriff Hat"
item_path = /obj/item/clothing/head/cowboyhat/sheriff/alt
item_path = /obj/item/clothing/head/costume/cowboyhat/sheriff/alt
/datum/loadout_item/head/cowboyhat_deputy
name = "Deputy Hat"
item_path = /obj/item/clothing/head/cowboyhat/deputy
item_path = /obj/item/clothing/head/costume/cowboyhat/deputy
/*
* TREK HATS (JOB-LOCKED)
@@ -417,27 +417,27 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/trekcap
name = "Federation Officer's Cap (White)"
item_path = /obj/item/clothing/head/caphat/parade/fedcap
item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap
restricted_roles = list(JOB_CAPTAIN,JOB_HEAD_OF_PERSONNEL)
/datum/loadout_item/head/trekcapcap
name = "Federation Officer's Cap (Black)"
item_path = /obj/item/clothing/head/caphat/parade/fedcap/black
item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap/black
restricted_roles = list(JOB_CAPTAIN,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY)
/datum/loadout_item/head/trekcapmedisci
name = "Federation Officer's Cap (Blue)"
item_path = /obj/item/clothing/head/caphat/parade/fedcap/medsci
item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap/medsci
restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_SECURITY_MEDIC,JOB_PARAMEDIC,JOB_CHEMIST,JOB_VIROLOGIST,JOB_PSYCHOLOGIST,JOB_GENETICIST,JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_VANGUARD_OPERATIVE,JOB_ORDERLY)
/datum/loadout_item/head/trekcapeng
name = "Federation Officer's Cap (Yellow)"
item_path = /obj/item/clothing/head/caphat/parade/fedcap/eng
item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap/eng
restricted_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_STATION_ENGINEER,JOB_SECURITY_MEDIC,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_CORRECTIONS_OFFICER,JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER, JOB_ENGINEERING_GUARD, JOB_CUSTOMS_AGENT)
/datum/loadout_item/head/trekcapsec
name = "Federation Officer's Cap (Red)"
item_path = /obj/item/clothing/head/caphat/parade/fedcap/sec
item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap/sec
restricted_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_STATION_ENGINEER,JOB_SECURITY_MEDIC,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_CORRECTIONS_OFFICER,JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER, JOB_CUSTOMS_AGENT)
/*
@@ -446,33 +446,33 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/imperial_cap
name = "Captain's Naval Cap"
item_path = /obj/item/clothing/head/imperial/cap
item_path = /obj/item/clothing/head/hats/imperial/cap
restricted_roles = list(JOB_CAPTAIN, JOB_NT_REP)
/datum/loadout_item/head/imperial_hop
name = "Head of Personnel's Naval Cap"
item_path = /obj/item/clothing/head/imperial/hop
item_path = /obj/item/clothing/head/hats/imperial/hop
restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_NT_REP)
/datum/loadout_item/head/imperial_cmo
name = "Chief Medical Officer's Naval Cap"
item_path = /obj/item/clothing/head/imperial/cmo
item_path = /obj/item/clothing/head/hats/imperial/cmo
restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER)
/datum/loadout_item/head/imperial_ce
name = "Chief Engineer's blast helmet."
item_path = /obj/item/clothing/head/imperial/ce
item_path = /obj/item/clothing/head/hats/imperial/ce
restricted_roles = list(JOB_CHIEF_ENGINEER)
/datum/loadout_item/head/cowboyhat_sec
name = "Cowboy Hat, Security"
item_path = /obj/item/clothing/head/cowboyhat/sec
item_path = /obj/item/clothing/head/costume/cowboyhat/sec
restricted_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_MEDIC,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_CORRECTIONS_OFFICER)
/datum/loadout_item/head/cowboyhat_secwide
name = "Wide Cowboy Hat, Security"
item_path = /obj/item/clothing/head/cowboyhat/wide/sec
item_path = /obj/item/clothing/head/costume/cowboyhat/wide/sec
restricted_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_MEDIC,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_CORRECTIONS_OFFICER)
/datum/loadout_item/head/ushanka/sec
@@ -482,12 +482,12 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/blasthelmet
name = "General's Helmet"
item_path = /obj/item/clothing/head/imperial/helmet
item_path = /obj/item/clothing/head/hats/imperial/helmet
restricted_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_MEDIC,JOB_SECURITY_OFFICER,JOB_CORRECTIONS_OFFICER,JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER)
/datum/loadout_item/head/navybluehoscap
name = "Head of Security's Naval Cap"
item_path = /obj/item/clothing/head/imperial/hos
item_path = /obj/item/clothing/head/hats/imperial/hos
restricted_roles = list(JOB_HEAD_OF_SECURITY)
/datum/loadout_item/head/navyblueofficerberet
@@ -497,12 +497,12 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/solofficercap
name = "Security Officer's Sol Cap"
item_path = /obj/item/clothing/head/sec/peacekeeper/sol
item_path = /obj/item/clothing/head/hats/sec/peacekeeper/sol
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_SECURITY_MEDIC, JOB_HEAD_OF_SECURITY, JOB_WARDEN)
/datum/loadout_item/head/soltrafficoff
name = "Traffic Officer Cap"
item_path = /obj/item/clothing/head/sec/peacekeeper/sol/traffic
item_path = /obj/item/clothing/head/hats/sec/peacekeeper/sol/traffic
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_SECURITY_MEDIC, JOB_HEAD_OF_SECURITY, JOB_WARDEN)
/datum/loadout_item/head/navybluewardenberet
@@ -522,22 +522,22 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
/datum/loadout_item/head/imperial_generic
name = "Grey Naval Officer Cap"
item_path = /obj/item/clothing/head/imperial
item_path = /obj/item/clothing/head/hats/imperial
restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_NT_REP)
/datum/loadout_item/head/imperial_grey
name = "Dark Grey Naval Officer Cap"
item_path = /obj/item/clothing/head/imperial/grey
item_path = /obj/item/clothing/head/hats/imperial/grey
restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_NT_REP)
/datum/loadout_item/head/imperial_red
name = "Red Naval Officer Cap"
item_path = /obj/item/clothing/head/imperial/red
item_path = /obj/item/clothing/head/hats/imperial/red
restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER)
/datum/loadout_item/head/imperial_white
name = "White Naval Officer Cap"
item_path = /obj/item/clothing/head/imperial/white
item_path = /obj/item/clothing/head/hats/imperial/white
restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER)
/*
modular_skyrat/modules/mapping/code/jobs.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/clothing/head/caphat/pilot
/obj/item/clothing/head/hats/caphat/pilot
name = "pilot's hat"
desc = "It's good being the king's navigator."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm
+1 -1
View File
@@ -43,7 +43,7 @@
/obj/item/clothing/mask/ballgag,
/obj/item/clothing/mask/ballgag/choking,
/obj/item/clothing/head/domina_cap,
/obj/item/clothing/head/maid,
/obj/item/clothing/head/costume/maid,
/obj/item/clothing/glasses/blindfold/kinky,
/obj/item/clothing/ears/kinky_headphones,
/obj/item/clothing/suit/straight_jacket/latex_straight_jacket,
modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm
+2 -2
View File
@@ -44,14 +44,14 @@
/obj/item/clothing/mask/muzzle/ring = 4,
/obj/item/clothing/head/domina_cap = 5,
/obj/item/clothing/head/helmet/space/deprivation_helmet = 5,
/obj/item/clothing/head/maid = 5,
/obj/item/clothing/head/costume/maid = 5,
/obj/item/clothing/glasses/blindfold/kinky = 5,
/obj/item/clothing/ears/kinky_headphones = 5,
/obj/item/clothing/mask/gas/bdsm_mask = 5,
/obj/item/reagent_containers/cup/lewd_filter = 5,
/obj/item/clothing/glasses/hypno = 4,
/obj/item/clothing/head/costume/kitty = 4,
/obj/item/clothing/head/rabbitears = 4,
/obj/item/clothing/head/costume/rabbitears = 4,
//neck
modular_skyrat/modules/modular_vending/code/autodrobe.dm
+11 -11
View File
@@ -8,25 +8,25 @@
/obj/item/clothing/under/costume/skyrat/vicvest = 5,
/obj/item/clothing/under/doug_dimmadome = 5,
/obj/item/clothing/glasses/biker = 5, //remind me to give these an up state later
/obj/item/clothing/head/cowboyhat/blackwide = 5,
/obj/item/clothing/head/cowboyhat/wide = 5,
/obj/item/clothing/head/costume/cowboyhat/blackwide = 5,
/obj/item/clothing/head/costume/cowboyhat/wide = 5,
/obj/item/clothing/neck/ranger_poncho = 5,
/obj/item/clothing/suit/duster = 5,
/obj/item/clothing/suit/frenchtrench = 5,
/obj/item/clothing/suit/dutchjacketsr = 5,
/obj/item/clothing/mask/gas/clown_colourable = 1,
/obj/item/clothing/mask/gas/clownbald = 1,
/obj/item/clothing/head/cowboyhat/sheriff = 5,
/obj/item/clothing/head/cowboyhat/sheriff/alt = 5,
/obj/item/clothing/head/cowboyhat/deputy = 5,
/obj/item/clothing/head/costume/cowboyhat/sheriff = 5,
/obj/item/clothing/head/costume/cowboyhat/sheriff/alt = 5,
/obj/item/clothing/head/costume/cowboyhat/deputy = 5,
/obj/item/clothing/shoes/jackboots/timbs = 1,
/obj/item/clothing/under/suit/skyrat/helltaker = 5,
/obj/item/clothing/under/suit/skyrat/helltaker/skirt = 5,
/obj/item/clothing/suit/toggle/lawyer/white = 5,
/obj/item/clothing/head/costume/jester/alt = 1,
/obj/item/clothing/under/rank/civilian/clown/jester/alt = 1,
/obj/item/clothing/head/christmas = 5,
/obj/item/clothing/head/christmas/green = 5,
/obj/item/clothing/head/costume/christmas = 5,
/obj/item/clothing/head/costume/christmas/green = 5,
/obj/item/clothing/under/costume/skyrat/christmas = 5,
/obj/item/clothing/under/costume/skyrat/christmas/green = 5,
/obj/item/clothing/under/costume/skyrat/christmas/croptop = 5,
@@ -47,10 +47,10 @@
/obj/item/clothing/mask/balaclavaadjust = 5,
/obj/item/clothing/mask/balaclava/threehole = 5,
/obj/item/clothing/mask/balaclava/threehole/green = 5,
/obj/item/clothing/head/imperial/helmet = 5,
/obj/item/clothing/head/imperial/red = 5,
/obj/item/clothing/head/imperial/grey = 5,
/obj/item/clothing/head/imperial = 5,
/obj/item/clothing/head/hats/imperial/helmet = 5,
/obj/item/clothing/head/hats/imperial/red = 5,
/obj/item/clothing/head/hats/imperial/grey = 5,
/obj/item/clothing/head/hats/imperial = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/red = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/grey = 5,
modular_skyrat/modules/modular_vending/code/clothesmate.dm
+3 -3
View File
@@ -5,9 +5,9 @@
"icon" = "hat-cowboy",
"products" = list(
/obj/item/clothing/head/colourable_flatcap= 5,
/obj/item/clothing/head/cowboyhat/sheriff = 5,
/obj/item/clothing/head/cowboyhat/sheriff/alt = 5,
/obj/item/clothing/head/cowboyhat/deputy = 5,
/obj/item/clothing/head/costume/cowboyhat/sheriff = 5,
/obj/item/clothing/head/costume/cowboyhat/sheriff/alt = 5,
/obj/item/clothing/head/costume/cowboyhat/deputy = 5,
/obj/item/clothing/head/fedora/beige = 5,
/obj/item/clothing/head/fedora/white = 5,
/obj/item/clothing/head/fedora/fedblack = 5,
modular_skyrat/modules/modular_vending/code/wardrobes.dm
+2 -2
View File
@@ -174,7 +174,7 @@
/obj/machinery/vending/wardrobe/bar_wardrobe/ghost_cafe
products = list(
/obj/item/clothing/head/that = 2,
/obj/item/clothing/head/hats/tophat = 2,
/obj/item/radio/headset/headset_srv = 0,
/obj/item/clothing/under/suit/sl = 2,
/obj/item/clothing/under/rank/civilian/bartender = 2,
@@ -207,7 +207,7 @@
/obj/item/clothing/suit/toggle/chef = 1,
/obj/item/clothing/under/rank/civilian/chef = 1,
/obj/item/clothing/under/rank/civilian/chef/skirt = 2,
/obj/item/clothing/head/chefhat = 1,
/obj/item/clothing/head/utility/chefhat = 1,
/obj/item/clothing/under/rank/civilian/cookjorts = 2,
/obj/item/clothing/shoes/cookflops = 2,
/obj/item/reagent_containers/cup/rag = 1,
modular_skyrat/modules/nanotrasen_naval_command/code/clothing.dm
+3 -3
View File
@@ -35,7 +35,7 @@
// HATS
/obj/item/clothing/head/caphat/naval
/obj/item/clothing/head/hats/caphat/naval
name = "naval cap"
desc = "A cap worn by those in the Nanotrasen Navy."
icon_state = "naval_command"
@@ -43,13 +43,13 @@
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/caphat/naval/beret
/obj/item/clothing/head/hats/caphat/naval/beret
name = "naval beret"
desc = "A beret worn by those in the Nanotrasen Navy."
icon_state = "naval_beret"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/caphat/naval/fleet_admiral
/obj/item/clothing/head/hats/caphat/naval/fleet_admiral
name = "fleet admiral's cap"
desc = "A cap worn by the Nanotrasen Fleet Admiral."
icon_state = "naval_fleet_admiral"
modular_skyrat/modules/nanotrasen_naval_command/code/outfits.dm
+4 -4
View File
@@ -23,7 +23,7 @@
id_trim = /datum/id_trim/centcom/naval
head = /obj/item/clothing/head/caphat/naval/beret
head = /obj/item/clothing/head/hats/caphat/naval/beret
uniform = /obj/item/clothing/under/rank/centcom/skyrat/naval
@@ -102,7 +102,7 @@
id_trim = /datum/id_trim/centcom/naval/rear_admiral
head = /obj/item/clothing/head/caphat/naval
head = /obj/item/clothing/head/hats/caphat/naval
uniform = /obj/item/clothing/under/rank/centcom/skyrat/naval/admiral
@@ -115,7 +115,7 @@
id_trim = /datum/id_trim/centcom/naval/admiral
head = /obj/item/clothing/head/caphat/naval
head = /obj/item/clothing/head/hats/caphat/naval
neck = /obj/item/clothing/neck/cloak/admiral
@@ -130,7 +130,7 @@
id_trim = /datum/id_trim/centcom/naval/fleet_admiral
head = /obj/item/clothing/head/caphat/naval/fleet_admiral
head = /obj/item/clothing/head/hats/caphat/naval/fleet_admiral
neck = /obj/item/clothing/neck/cloak/fleet_admiral
modular_skyrat/modules/sec_haul/code/misc/vending.dm
+2 -2
View File
@@ -73,8 +73,8 @@
/obj/item/clothing/head/security_cap = 10,
/obj/item/clothing/head/beret/sec/peacekeeper = 5,
/obj/item/clothing/head/costume/ushanka/sec/blue = 10,
/obj/item/clothing/head/sec/peacekeeper/sol = 5,
/obj/item/clothing/head/sec/peacekeeper/sol/traffic = 5,
/obj/item/clothing/head/hats/sec/peacekeeper/sol = 5,
/obj/item/clothing/head/hats/sec/peacekeeper/sol/traffic = 5,
/obj/item/clothing/gloves/color/black/security = 10,
)
premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3,
modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/obj/item/clothing/head/sec/peacekeeper/sergeant
/obj/item/clothing/head/hats/sec/peacekeeper/sergeant
name = "peacekeeper sergeant hat"
desc = "A drill sergeants cap, wearing this increases your loudness. So they say."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
modular_skyrat/modules/teshari/code/teshari_clothes.dm
+1 -1
View File
@@ -125,7 +125,7 @@
/obj/item/clothing/head/frenchberet
greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari
/obj/item/clothing/head/sec/navywarden/syndicate
/obj/item/clothing/head/beret/sec/navywarden/syndicate
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
/obj/item/clothing/head/nanotrasen_consultant/beret
modular_skyrat/modules/vox_sprites/code/head.dm
+1 -1
View File
@@ -58,7 +58,7 @@
/obj/item/clothing/head/frenchberet
greyscale_config_worn_vox = /datum/greyscale_config/beret/worn/vox
/obj/item/clothing/head/sec/navywarden/syndicate
/obj/item/clothing/head/beret/sec/navywarden/syndicate
greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox
/obj/item/clothing/head/nanotrasen_consultant/beret
tools/UpdatePaths/Scripts_Skyrat/hats_repath.txt
+37
View File
@@ -0,0 +1,37 @@
#comment This replaces all skyrat hat paths
/obj/item/clothing/head/flakhelm : /obj/item/clothing/head/hats/flakhelm {@OLD}
/obj/item/clothing/head/cowboyhat : /obj/item/clothing/head/costume/cowboyhat {@OLD}
/obj/item/clothing/head/cowboyhat/black : /obj/item/clothing/head/costume/cowboyhat/black {@OLD}
/obj/item/clothing/head/cowboyhat/white : /obj/item/clothing/head/costume/cowboyhat/black {@OLD}
/obj/item/clothing/head/cowboyhat/pink : /obj/item/clothing/head/costume/cowboyhat/black {@OLD}
/obj/item/clothing/head/cowboyhat/sec : /obj/item/clothing/head/costume/cowboyhat/black {@OLD}
/obj/item/clothing/head/kepi : /obj/item/clothing/head/costume/kepi {@OLD}
/obj/item/clothing/head/kepi/old : /obj/item/clothing/head/costume/kepi/old {@OLD}
/obj/item/clothing/head/maid : /obj/item/clothing/head/costume/maid {@OLD}
/obj/item/clothing/head/intern/developer : /obj/item/clothing/head/hats/intern/developer {@OLD}
/obj/item/clothing/head/sec/navywarden/syndicate : /obj/item/clothing/head/beret/sec/navywarden/syndicate {@OLD}
/obj/item/clothing/head/cowboyhat/blackwide : /obj/item/clothing/head/costume/cowboyhat/blackwide {@OLD}
/obj/item/clothing/head/cowboyhat/wide : /obj/item/clothing/head/costume/cowboyhat/wide {@OLD}
/obj/item/clothing/head/cowboyhat/wide/sec : /obj/item/clothing/head/costume/cowboyhat/wide/sec {@OLD}
/obj/item/clothing/head/whiterussian : /obj/item/clothing/head/costume/whiterussian {@OLD}
/obj/item/clothing/head/whiterussian/white : /obj/item/clothing/head/costume/whiterussian/white {@OLD}
/obj/item/clothing/head/whiterussian/black : /obj/item/clothing/head/costume/whiterussian/black {@OLD}
/obj/item/clothing/head/hos/peacekeeper/sol : /obj/item/clothing/head/hats/hos/peacekeeper/sol {@OLD}
/obj/item/clothing/head/christmas : /obj/item/clothing/head/costume/christmas {@OLD}
/obj/item/clothing/head/christmas/green : /obj/item/clothing/head/costume/christmas/green {@OLD}
/obj/item/clothing/head/cowboyhat/sheriff : /obj/item/clothing/head/costume/cowboyhat/sheriff {@OLD}
/obj/item/clothing/head/cowboyhat/sheriff/alt : /obj/item/clothing/head/costume/cowboyhat/sheriff/alt {@OLD}
/obj/item/clothing/head/cowboyhat/deputy : /obj/item/clothing/head/costume/cowboyhat/deputy {@OLD}
/obj/item/clothing/head/flowerpin : /obj/item/clothing/head/costume/flowerpin {@OLD}
/obj/item/clothing/head/imperial : /obj/item/clothing/head/hats/imperial {@OLD}
/obj/item/clothing/head/imperial/grey : /obj/item/clothing/head/hats/imperial/grey {@OLD}
/obj/item/clothing/head/imperial/red : /obj/item/clothing/head/hats/imperial/red {@OLD}
/obj/item/clothing/head/imperial/white : /obj/item/clothing/head/hats/imperial/white {@OLD}
/obj/item/clothing/head/imperial/cap : /obj/item/clothing/head/hats/imperial/cap {@OLD}
/obj/item/clothing/head/imperial/hop : /obj/item/clothing/head/hats/imperial/hop {@OLD}
/obj/item/clothing/head/imperial/hos : /obj/item/clothing/head/hats/imperial/hos {@OLD}
/obj/item/clothing/head/imperial/cmo : /obj/item/clothing/head/hats/imperial/cmo {@OLD}
/obj/item/clothing/head/imperial/ce : /obj/item/clothing/head/hats/imperial/ce {@OLD}
/obj/item/clothing/head/imperial/helmet : /obj/item/clothing/head/hats/imperial/helmet {@OLD}
/obj/item/clothing/head/rabbitears : /obj/item/clothing/head/costume/rabbitears {@OLD}