Files
WaterpigandMajkl-J bb70889f6e TG Upstream Part 1
3591 individual conflicts

Update build.js

Update install_node.sh

Update byond.js

oh my fucking god

hat

slow

huh

holy shit

we all fall down

2 more I missed

2900 individual conflicts

2700 Individual conflicts

replaces yarn file with tg version, bumping us down to 2200-ish

Down to 2000 individual conflicts

140 down

mmm

aaaaaaaaaaaaaaaaaaa

not yt

575

soon

900 individual conflicts

600 individual conflicts, 121 file conflicts

im not okay

160 across 19 files

29 in 4 files

0 conflicts, compiletime fix time

some minor incap stuff

missed ticks

weird dupe definition stuff

missed ticks 2

incap fixes

undefs and pie fix

Radio update and some extra minor stuff

returns a single override

no more dupe definitions, 175 compiletime errors

Unticked file fix

sound and emote stuff

honk and more radio stuff
2024-10-19 08:04:33 -07:00

160 lines
7.9 KiB
Plaintext

/obj/item/storage/bag/garment
name = "garment bag"
icon = 'icons/obj/storage/storage.dmi'
icon_state = "garment_bag"
desc = "A bag for storing extra clothes and shoes."
slot_flags = NONE
resistance_flags = FLAMMABLE
/obj/item/storage/bag/garment/captain
name = "captain's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the captain."
/obj/item/storage/bag/garment/hos
name = "head of security's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the head of security."
/obj/item/storage/bag/garment/warden
name = "warden's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the warden."
/obj/item/storage/bag/garment/hop
name = "head of personnel's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the head of personnel."
/obj/item/storage/bag/garment/research_director
name = "research director's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the research director."
/obj/item/storage/bag/garment/chief_medical
name = "chief medical officer's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the chief medical officer."
/obj/item/storage/bag/garment/engineering_chief
name = "chief engineer's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the chief engineer."
/obj/item/storage/bag/garment/quartermaster
name = "quartermasters's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the quartermaster."
/obj/item/storage/bag/garment/Initialize(mapload)
. = ..()
atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
atom_storage.numerical_stacking = FALSE
atom_storage.max_total_storage = 200
atom_storage.max_slots = 15
atom_storage.insert_preposition = "in"
atom_storage.set_holdable(/obj/item/clothing)
/obj/item/storage/bag/garment/captain/PopulateContents()
new /obj/item/clothing/under/rank/captain(src)
new /obj/item/clothing/under/rank/captain/skirt(src)
new /obj/item/clothing/under/rank/captain/parade(src)
new /obj/item/clothing/suit/armor/vest/capcarapace(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/captains_formal(src)
new /obj/item/clothing/suit/hooded/wintercoat/captain(src)
new /obj/item/clothing/suit/jacket/capjacket(src)
new /obj/item/clothing/glasses/sunglasses/gar/giga(src)
new /obj/item/clothing/gloves/captain(src)
new /obj/item/clothing/head/costume/crown/fancy(src)
new /obj/item/clothing/head/hats/caphat(src)
new /obj/item/clothing/head/hats/caphat/parade(src)
new /obj/item/clothing/neck/cloak/cap(src)
new /obj/item/clothing/shoes/laceup(src)
/obj/item/storage/bag/garment/hop/PopulateContents()
new /obj/item/clothing/under/rank/civilian/head_of_personnel(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt(src)
new /obj/item/clothing/suit/armor/vest/hop(src)
new /obj/item/clothing/suit/hooded/wintercoat/hop(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/head/hats/hopcap(src)
new /obj/item/clothing/neck/cloak/hop(src)
new /obj/item/clothing/shoes/laceup(src)
/obj/item/storage/bag/garment/hos/PopulateContents()
//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)
new /obj/item/clothing/under/rank/security/head_of_security/parade(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src)
new /obj/item/clothing/gloves/tackler/combat(src)
new /obj/item/clothing/suit/armor/hos(src)
new /obj/item/clothing/suit/armor/hos/hos_formal(src)
new /obj/item/clothing/suit/armor/hos/trenchcoat/winter(src)
new /obj/item/clothing/suit/armor/vest/leather(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga(src)
new /obj/item/clothing/head/hats/hos/beret(src)
new /obj/item/clothing/head/hats/hos/cap(src)
new /obj/item/clothing/mask/gas/sechailer/swat(src)
new /obj/item/clothing/neck/cloak/hos(src)
/obj/item/storage/bag/garment/warden/PopulateContents()
new /obj/item/clothing/suit/armor/vest/warden(src)
//new /obj/item/clothing/head/hats/warden(src) SKYRAT EDIT REMOVAL
//new /obj/item/clothing/head/hats/warden/drill(src) SKYRAT EDIT REMOVAL
new /obj/item/clothing/head/beret/sec/navywarden(src)
//new /obj/item/clothing/suit/armor/vest/warden/alt(src) SKYRAT EDIT REMOVAL
new /obj/item/clothing/under/rank/security/warden/formal(src)
new /obj/item/clothing/suit/jacket/warden/blue(src) //SKYRAT ADDITION - FORMAL COAT
//new /obj/item/clothing/under/rank/security/warden/skirt(src) SKYRAT EDIT REMOVAL
new /obj/item/clothing/gloves/krav_maga/sec(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/mask/gas/sechailer(src)
/obj/item/storage/bag/garment/research_director/PopulateContents()
new /obj/item/clothing/under/rank/rnd/research_director(src)
new /obj/item/clothing/under/rank/rnd/research_director/skirt(src)
new /obj/item/clothing/under/rank/rnd/research_director/alt(src)
new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src)
new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src)
new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src)
new /obj/item/clothing/suit/toggle/labcoat/skyrat/rd(src) //SKYRAT EDIT ADDITION
new /obj/item/clothing/suit/hooded/wintercoat/science/rd(src)
new /obj/item/clothing/head/beret/science/rd(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/neck/cloak/rd(src)
new /obj/item/clothing/shoes/jackboots(src)
/obj/item/storage/bag/garment/chief_medical/PopulateContents()
new /obj/item/clothing/under/rank/medical/chief_medical_officer(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck/skirt(src)
new /obj/item/clothing/suit/hooded/wintercoat/medical/cmo(src)
new /obj/item/clothing/suit/toggle/labcoat/cmo(src)
new /obj/item/clothing/gloves/latex/nitrile(src)
new /obj/item/clothing/head/beret/medical/cmo(src)
new /obj/item/clothing/head/utility/surgerycap/cmo(src)
new /obj/item/clothing/neck/cloak/cmo(src)
new /obj/item/clothing/shoes/sneakers/blue (src)
/obj/item/storage/bag/garment/engineering_chief/PopulateContents()
new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck/skirt(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src)
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/clothing/gloves/chief_engineer(src)
new /obj/item/clothing/head/utility/hardhat/white(src)
new /obj/item/clothing/head/utility/hardhat/welding/white(src)
new /obj/item/clothing/neck/cloak/ce(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
/obj/item/storage/bag/garment/quartermaster/PopulateContents()
new /obj/item/clothing/under/rank/cargo/qm(src)
new /obj/item/clothing/under/rank/cargo/qm/skirt(src)
new /obj/item/clothing/suit/hooded/wintercoat/cargo/qm(src)
new /obj/item/clothing/suit/utility/fire/firefighter(src)
new /obj/item/clothing/gloves/fingerless(src)
new /obj/item/clothing/suit/jacket/quartermaster(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/neck/cloak/qm(src)
new /obj/item/clothing/shoes/sneakers/brown(src)