cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-11 08:06:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repaths a few outdated instances of the HoS's cap, removes a straggling redsec item (#20972)

Browse Source 
* Remove HoS's redsec skirt from their locker

Redsec is dead.

* Fixes missing repaths to hos/cap and other related tweaks

TG repathed these, which means now we don't need to worry about reskinning applying to the beret! We should probably make sure to use the new type tho...

* remove dupe hop coat from garmentbag

* update the single hos cap path on modular interdyne

* more missed cap paths and removes now-redundant beret flag

The base-type has the flag which covers the beret
This commit is contained in:
OrionTheFox
2023-05-07 20:15:37 -06:00
committed by GitHub
parent 91f74063c3
commit 429a716d44
8 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
+1 -1
View File
@@ -4976,7 +4976,7 @@
name = "\proper station admiral's locker";
req_access = list("syndicate")
},
/obj/item/clothing/head/hats/hos/syndicate,
/obj/item/clothing/head/hats/hos/cap/syndicate,
/obj/item/clothing/head/hats/hos/beret/syndicate,
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/under/rank/captain/skyrat/utility/syndicate,
code/game/objects/items/storage/garment.dm
+1 -2
View File
@@ -70,10 +70,9 @@
new /obj/item/clothing/head/hats/hopcap(src)
new /obj/item/clothing/neck/cloak/hop(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/suit/hooded/wintercoat/hop(src)
/obj/item/storage/bag/garment/hos/PopulateContents()
new /obj/item/clothing/under/rank/security/head_of_security/skirt(src)
//new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) SKYRAT EDIT REMOVAL - Blue Sec
new /obj/item/clothing/under/rank/security/head_of_security/alt(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src)
new /obj/item/clothing/under/rank/security/head_of_security/grey(src)
code/modules/clothing/head/jobs.dm
-1
View File
@@ -209,7 +209,6 @@
greyscale_config = /datum/greyscale_config/beret_badge
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
greyscale_colors = "#39393f#f0cc8f"
current_skin = "beret_badge" //SKYRAT EDIT ADDITION - prevents reskinning the hat; (RESKINNING NEEDS A CODE REWRITE SO IT STOPS SPREADING TO SUBTYPES OR CAN AT LEAST BE SET TO FALSE)
/obj/item/clothing/head/hats/hos/beret/navyhos
name = "head of security's formal beret"
modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm
-3
View File
@@ -12,9 +12,6 @@
/obj/item/clothing/head/utility/chefhat
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/hats/hos/beret
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/soft/paramedic
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
modular_skyrat/modules/command_vendor/code/vending.dm
+2 -2
View File
@@ -115,9 +115,9 @@
/obj/item/clothing/shoes/sneakers/brown = 1,
)
access_lists["[ACCESS_HOS]"] = list(
/obj/item/clothing/head/hats/hos = 1,
/obj/item/clothing/head/hats/hos/cap = 1,
/obj/item/clothing/head/hats/hos/beret/navyhos = 1,
/obj/item/clothing/head/hats/hos/peacekeeper/sol = 1,
/obj/item/clothing/head/hats/hos/cap/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,
modular_skyrat/modules/customization/modules/clothing/head/head.dm
+1 -1
View File
@@ -81,7 +81,7 @@
icon_state = "policeofficercap"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/hats/hos/peacekeeper/sol
/obj/item/clothing/head/hats/hos/cap/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'
modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
+2 -2
View File
@@ -294,7 +294,7 @@
fire = 20
acid = 50
/obj/item/clothing/head/hats/hos
/obj/item/clothing/head/hats/hos/cap
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "hoscap_blue"
@@ -319,7 +319,7 @@
)
//Need to quickly redefine this so the icon doesnt break
/obj/item/clothing/head/hats/hos/syndicate
/obj/item/clothing/head/hats/hos/cap/syndicate
icon = 'icons/obj/clothing/head/hats.dmi'
worn_icon = 'icons/mob/clothing/head/hats.dmi'
icon_state = "hoscap"
modular_skyrat/modules/mapping/code/mob_spawns.dm
+1 -1
View File
@@ -300,7 +300,7 @@
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
back = /obj/item/storage/backpack/satchel
belt = /obj/item/gun/ballistic/automatic/pistol/aps
head = /obj/item/clothing/head/hats/hos/syndicate
head = /obj/item/clothing/head/hats/hos/cap/syndicate
id = /obj/item/card/id/advanced/gold/generic
id_trim = /datum/id_trim/syndicom/skyrat/ds2/stationadmiral