Files
Bubberstation/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
Waterpig 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

110 lines
4.0 KiB
Plaintext

/obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker"
req_access = list(ACCESS_CE)
icon_state = "ce"
/obj/structure/closet/secure_closet/engineering_chief/PopulateContents()
..()
new /obj/item/storage/bag/garment/engineering_chief (src)
new /obj/item/computer_disk/command/ce(src)
new /obj/item/radio/headset/heads/ce(src)
new /obj/item/megaphone/command(src)
new /obj/item/holosign_creator/atmos(src)
new /obj/item/assembly/flash/handheld(src)
new /obj/item/door_remote/chief_engineer(src)
new /obj/item/storage/lockbox/medal/engineering(src)
new /obj/item/circuitboard/machine/techfab/department/engineering(src)
new /obj/item/extinguisher/advanced(src)
new /obj/item/storage/photo_album/ce(src)
new /obj/item/storage/box/skillchips/engineering(src)
new /obj/item/storage/box/gas_miner_beacons(src) // SKYRAT EDIT ADDITION
new /obj/item/construction/plumbing/engineering(src) //SKYRAT EDIT ADDITION
new /obj/item/circuitboard/machine/rodstopper(src) //SKYRAT EDIT ADDITION
new /obj/item/card/id/departmental_budget/eng(src) //SKYRAT EDIT ADDITION
new /obj/item/storage/box/stickers/chief_engineer(src)
/obj/structure/closet/secure_closet/engineering_chief/populate_contents_immediate()
. = ..()
// Traitor steal objective
new /obj/item/blueprints(src)
new /obj/item/pipe_dispenser/bluespace(src) // SKYRAT EDIT -- BLUESPACE RPD -- ORIGINAL: new /obj/item/pipe_dispenser(src)
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies locker"
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng"
icon_door = "eng_elec"
/obj/structure/closet/secure_closet/engineering_electrical/PopulateContents()
..()
var/static/items_inside = list(
/obj/item/inducer = 2,
/obj/item/storage/toolbox/electrical = 3,
/obj/item/electronics/apc = 3,
/obj/item/multitool = 3)
generate_items_inside(items_inside,src)
/obj/structure/closet/secure_closet/engineering_electrical/populate_contents_immediate()
. = ..()
new /obj/item/clothing/gloves/color/yellow(src)
new /obj/item/clothing/gloves/color/yellow(src)
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies locker"
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng"
icon_door = "eng_weld"
/obj/structure/closet/secure_closet/engineering_welding/PopulateContents()
..()
for(var/i in 1 to 3)
new /obj/item/clothing/head/utility/welding(src)
for(var/i in 1 to 3)
new /obj/item/weldingtool(src)
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng_secure"
/obj/structure/closet/secure_closet/engineering_personal/PopulateContents()
..()
new /obj/item/radio/headset/headset_eng(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/holosign_creator/engineering(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/storage/box/emptysandbags(src)
new /obj/item/storage/bag/construction(src)
new /obj/item/construction/plumbing/engineering(src) //SKYRAT EDIT ADDITION
/obj/structure/closet/secure_closet/atmospherics
name = "atmospheric technician's locker"
req_access = list(ACCESS_ATMOSPHERICS)
icon_state = "atmos"
/obj/structure/closet/secure_closet/atmospherics/PopulateContents()
..()
new /obj/item/radio/headset/headset_eng(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/holosign_creator/atmos(src)
new /obj/item/watertank/atmos(src)
new /obj/item/clothing/suit/utility/fire/atmos(src)
new /obj/item/clothing/gloves/atmos(src)
new /obj/item/clothing/mask/gas/atmos(src)
new /obj/item/clothing/head/utility/hardhat/welding/atmos(src)
new /obj/item/clothing/glasses/meson/engine/tray(src)
new /obj/item/extinguisher/advanced(src)
/obj/structure/closet/secure_closet/atmospherics/populate_contents_immediate()
. = ..()
new /obj/item/pipe_dispenser(src)