mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-27 15:18:09 +01:00
Initial merge fixes
Clean Compile, 0E, 0W
This commit is contained in:
Hawk_v3
@@ -54,7 +54,7 @@
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Ballistic weapons crate"
|
||||
|
||||
/datum/supply_packs/randomised/misc/telecrate
|
||||
/datum/supply_pack/randomised/misc/telecrate
|
||||
name = "Confiscated equipment"
|
||||
num_contained = 1
|
||||
contains = list(
|
||||
|
||||
@@ -291,7 +291,8 @@
|
||||
containername = "Tritium crate"
|
||||
containertype = /obj/structure/closet/crate/engineering
|
||||
contains = list(/obj/fiftyspawner/tritium)
|
||||
/datum/supply_packs/eng/am_shielding
|
||||
|
||||
/datum/supply_pack/eng/am_shielding
|
||||
contains = list(/obj/item/device/am_shielding_container = 3)
|
||||
name = "Antimatter shielding three units"
|
||||
cost = 50
|
||||
@@ -299,7 +300,7 @@
|
||||
containername = "Antimatter shielding crate"
|
||||
access = access_engine
|
||||
|
||||
/datum/supply_packs/eng/am_container
|
||||
/datum/supply_pack/eng/am_container
|
||||
contains = list(/obj/item/weapon/am_containment)
|
||||
name = "Antimatter container"
|
||||
cost = 25
|
||||
@@ -307,7 +308,7 @@
|
||||
containername = "AM container crate"
|
||||
access = access_engine
|
||||
|
||||
/datum/supply_packs/eng/am_controlunit
|
||||
/datum/supply_pack/eng/am_controlunit
|
||||
contains = list(/obj/machinery/power/am_control_unit)
|
||||
name = "Antimatter control unit"
|
||||
cost = 75
|
||||
|
||||
@@ -198,7 +198,7 @@
|
||||
containername = "Beanbag shells"
|
||||
access = null
|
||||
|
||||
/datum/supply_packs/randomised/munitions/yw_revolver
|
||||
/datum/supply_pack/randomised/munitions/yw_revolver
|
||||
name = "Revolver Crate"
|
||||
num_contained = 2
|
||||
contains = list(
|
||||
@@ -214,7 +214,7 @@
|
||||
containername = "Revolver Crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/randomised/munitions/yw_assault
|
||||
/datum/supply_pack/randomised/munitions/yw_assault
|
||||
name = "Assault rifle crate"
|
||||
num_contained = 2
|
||||
contains = list(
|
||||
@@ -227,7 +227,7 @@
|
||||
containername = "Assault rifle crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/randomised/munitions/yw_smg
|
||||
/datum/supply_pack/randomised/munitions/yw_smg
|
||||
name = "Smg crate"
|
||||
num_contained = 2
|
||||
contains = list(
|
||||
@@ -239,7 +239,7 @@
|
||||
containername = "Smg crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/munitions/yw_mg
|
||||
/datum/supply_pack/munitions/munitions/yw_mg
|
||||
name = "Light machine gun crate"
|
||||
contains = list(/obj/item/weapon/gun/projectile/automatic/l6_saw = 1)
|
||||
cost = 500
|
||||
|
||||
@@ -214,7 +214,7 @@
|
||||
containername = "Frontier Mining voidsuit crate"
|
||||
access = access_mining
|
||||
|
||||
/datum/supply_packs/voidsuits/unathi_bs_yw
|
||||
/datum/supply_pack/voidsuits/unathi_bs_yw
|
||||
name = "Unathi breacher chassis"
|
||||
contains = list(/obj/item/weapon/rig/breacher/fancy)
|
||||
cost = 350
|
||||
|
||||
@@ -28,7 +28,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
power_light = 0
|
||||
power_equip = 0
|
||||
power_environ = 0
|
||||
ambience = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg','sound/ambience/serspaceamb1.ogg','sound/music/freefallin.mid')
|
||||
ambience = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg','sound/ambience/space/space_serithi.ogg','sound/music/freefallin.mid')
|
||||
base_turf = /turf/space
|
||||
ambience = AMBIENCE_SPACE
|
||||
|
||||
|
||||
@@ -1,37 +1,37 @@
|
||||
/area/maintenance/lowfloor1
|
||||
name = "Maintenance"
|
||||
icon_state = "amaint"
|
||||
ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg')
|
||||
ambience = list('sound/ambience/maintenance/maintenance1.ogg','sound/ambience/maintenance/maintenance2.ogg')
|
||||
|
||||
/area/maintenance/lowfloor2
|
||||
name = "Maintenance"
|
||||
icon_state = "amaint"
|
||||
ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg')
|
||||
ambience = list('sound/ambience/maintenance/maintenance1.ogg','sound/ambience/maintenance/maintenance2.ogg')
|
||||
|
||||
/area/maintenance/lowfloor3
|
||||
name = "Maintenance"
|
||||
icon_state = "amaint"
|
||||
ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg')
|
||||
ambience = list('sound/ambience/maintenance/maintenance1.ogg','sound/ambience/maintenance/maintenance2.ogg')
|
||||
|
||||
/area/maintenance/lowfloor4
|
||||
name = "Maintenance"
|
||||
icon_state = "amaint"
|
||||
ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg')
|
||||
ambience = list('sound/ambience/maintenance/maintenance1.ogg','sound/ambience/maintenance/maintenance2.ogg')
|
||||
|
||||
/area/maintenance/lowfloor5
|
||||
name = "Maintenance"
|
||||
icon_state = "amaint"
|
||||
ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg')
|
||||
ambience = list('sound/ambience/maintenance/maintenance1.ogg','sound/ambience/maintenance/maintenance2.ogg')
|
||||
|
||||
/area/maintenance/lowfloor6
|
||||
name = "Maintenance"
|
||||
icon_state = "amaint"
|
||||
ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg')
|
||||
ambience = list('sound/ambience/maintenance/maintenance1.ogg','sound/ambience/maintenance/maintenance2.ogg')
|
||||
|
||||
/area/maintenance/lowatmos
|
||||
name = "Lower Engineering"
|
||||
icon_state = "amaint"
|
||||
ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg')
|
||||
ambience = list('sound/ambience/maintenance/maintenance1.ogg','sound/ambience/maintenance/maintenance2.ogg')
|
||||
|
||||
/area/maintenance/blueserg
|
||||
name = "Blue Sergal"
|
||||
|
||||
@@ -87,8 +87,6 @@ HONK Blaster and a pulse cannon protected by projectile armor and powered by a b
|
||||
ME.attach(src)
|
||||
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/cannon(src)
|
||||
ME.attach(src)
|
||||
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/cannon/weak(src) //Saves energy, I suppose. Anti-infantry.
|
||||
ME.attach(src)
|
||||
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive(src)
|
||||
ME.attach(src)
|
||||
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src)
|
||||
|
||||
@@ -303,7 +303,6 @@
|
||||
icon_state = "piano"
|
||||
anchored = 1
|
||||
density = 1
|
||||
var/datum/song/song
|
||||
|
||||
/obj/structure/device/piano/minimoog
|
||||
name = "space minimoog"
|
||||
|
||||
@@ -52,7 +52,7 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
|
||||
else
|
||||
data["phoron"] = 0
|
||||
|
||||
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||
ui = GLOB.nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||
if (!ui)
|
||||
ui = new(user, src, ui_key, "phorochem.tmpl", "Phorochemputer", 480, 400)
|
||||
ui.set_initial_data(data)
|
||||
@@ -106,7 +106,7 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
|
||||
source = tile
|
||||
if(source)
|
||||
message = "Electromagnetic tile located at: [source.x], [source.y]"
|
||||
nanomanager.update_uis(src)
|
||||
GLOB.nanomanager.update_uis(src)
|
||||
source_pad = null
|
||||
dest_pad = null
|
||||
spawn(10)
|
||||
@@ -232,7 +232,7 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
|
||||
timeLeft *= 2 //half seconds to make escape impossible from electrical fields
|
||||
timeLeftMax = timeLeft
|
||||
|
||||
nanomanager.update_uis(src) //update progress bar with new timeLeftMax
|
||||
GLOB.nanomanager.update_uis(src) //update progress bar with new timeLeftMax
|
||||
|
||||
var/obj/effect/electrical_field/small/field
|
||||
var/obj/effect/electrical_field/big/field2
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
if(istype(W, /obj/item/weapon/reagent_containers))
|
||||
user.drop_item()
|
||||
W.loc = src.loc
|
||||
else if(istype(W, /obj/item/weapon/wrench))
|
||||
else if(istype(W, /obj/item/weapon/tool/wrench))
|
||||
var/word = "tighten"
|
||||
src.anchored = !src.anchored
|
||||
if(!src.anchored)
|
||||
word = "undo"
|
||||
user << "You [word] the telepad anchor bolts."
|
||||
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
|
||||
else if(istype(W, /obj/item/weapon/screwdriver) && !src.anchored)
|
||||
else if(istype(W, /obj/item/weapon/tool/screwdriver) && !src.anchored)
|
||||
user << "You fold the telepad."
|
||||
new /obj/item/weapon/phoronics_telepad(src.loc)
|
||||
del(src)
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
data["error"] = 1
|
||||
data["error_msg"] = "u wot m8"
|
||||
|
||||
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||
ui = GLOB.nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||
if (!ui)
|
||||
ui = new(user, src, ui_key, "server_shipping.tmpl", src.name, 400, 500)
|
||||
ui.set_initial_data(data)
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src) //They /are/ a security borg, after all.
|
||||
src.modules += new /obj/item/weapon/dogborg/pounce(src) //Pounce
|
||||
src.modules += new /obj/item/device/dogborg/pounce_module(src) //Pounce shit test
|
||||
src.modules += new /obj/item/weapon/crowbar(src)
|
||||
src.modules += new /obj/item/weapon/tool/crowbar(src)
|
||||
src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem.
|
||||
|
||||
var/datum/matter_synth/water = new /datum/matter_synth()
|
||||
@@ -278,7 +278,7 @@
|
||||
src.modules += new /obj/item/taperoll/police(src)
|
||||
src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun(src)
|
||||
src.modules += new /obj/item/weapon/dogborg/swordtail(src)
|
||||
src.modules += new /obj/item/weapon/crowbar(src)
|
||||
src.modules += new /obj/item/weapon/tool/crowbar(src)
|
||||
src.modules += new /obj/item/device/dogborg/pounce_module(src) //Pounce shit test
|
||||
src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src)
|
||||
|
||||
|
||||
@@ -43,14 +43,14 @@
|
||||
src.modules += new /obj/item/device/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig.
|
||||
src.modules += new /obj/item/device/dogborg/pounce_module(src) //Pounce shit test
|
||||
src.modules += new /obj/item/borg/sight/material(src)
|
||||
src.modules += new /obj/item/weapon/wrench(src)
|
||||
src.modules += new /obj/item/weapon/screwdriver(src)
|
||||
src.modules += new /obj/item/weapon/tool/wrench(src)
|
||||
src.modules += new /obj/item/weapon/tool/screwdriver(src)
|
||||
src.modules += new /obj/item/weapon/storage/bag/ore(src)
|
||||
src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
|
||||
src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
|
||||
src.modules += new /obj/item/weapon/gripper/miner(src)
|
||||
src.modules += new /obj/item/weapon/mining_scanner(src)
|
||||
src.modules += new /obj/item/weapon/crowbar(src)
|
||||
src.modules += new /obj/item/weapon/tool/crowbar(src)
|
||||
src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
|
||||
src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem.
|
||||
R.icon = 'icons/mob/widerobot_vr.dmi'
|
||||
|
||||
@@ -16,19 +16,19 @@
|
||||
|
||||
/obj/item/ammo_magazine/c45m2024/rubber
|
||||
name = "m2024 magazine (.45 rubber)"
|
||||
ammo_type = /obj/item/ammo_casing/a45r
|
||||
ammo_type = /obj/item/ammo_casing/a45/rubber
|
||||
|
||||
/obj/item/ammo_magazine/c45m2024/practice
|
||||
name = "m2024 magazine (.45 practice)"
|
||||
ammo_type = /obj/item/ammo_casing/a45p
|
||||
ammo_type = /obj/item/ammo_casing/a45/practice
|
||||
|
||||
/obj/item/ammo_magazine/c45m2024/flash
|
||||
name = "m2024 magazine (.45 flash)"
|
||||
ammo_type = /obj/item/ammo_casing/a45f
|
||||
ammo_type = /obj/item/ammo_casing/a45/flash
|
||||
|
||||
/obj/item/ammo_magazine/c45m2024/ap
|
||||
name = "m2024 magazine (.45 AP)"
|
||||
ammo_type = /obj/item/ammo_casing/a45ap
|
||||
ammo_type = /obj/item/ammo_casing/a45/ap
|
||||
|
||||
|
||||
/******** 9mm glock ********/
|
||||
@@ -48,15 +48,15 @@
|
||||
initial_ammo = 0
|
||||
|
||||
/obj/item/ammo_magazine/gl9mm/flash
|
||||
ammo_type = /obj/item/ammo_casing/a9mmf
|
||||
ammo_type = /obj/item/ammo_casing/a9mm/flash
|
||||
|
||||
/obj/item/ammo_magazine/gl9mm/rubber
|
||||
name = "glock magazine (9mm rubber)"
|
||||
ammo_type = /obj/item/ammo_casing/a9mmr
|
||||
ammo_type = /obj/item/ammo_casing/a9mm/rubber
|
||||
|
||||
/obj/item/ammo_magazine/gl9mm/practice
|
||||
name = "glock magazine (9mm practice)"
|
||||
ammo_type = /obj/item/ammo_casing/a9mmp
|
||||
ammo_type = /obj/item/ammo_casing/a9mm/practice
|
||||
|
||||
/******* MG42 ********/
|
||||
/obj/item/ammo_magazine/mg42
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+2597
-48452
File diff suppressed because it is too large
Load Diff
+1974
-38225
File diff suppressed because it is too large
Load Diff
+2157
-42398
File diff suppressed because it is too large
Load Diff
@@ -406,11 +406,11 @@
|
||||
"alH" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/power/emitter,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/storage)
|
||||
"alI" = (/obj/machinery/computer/station_alert,/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring)
|
||||
"alK" = (/obj/structure/ladder/up,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/engineering/shaft)
|
||||
"alN" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/extinguisher_cabinet{dir = 1; icon_state = "extinguisher_closed"; pixel_y = 32},/obj/vehicle/train/cargo/trolley,/turf/simulated/floor/tiled/monotile,/area/engineering/hallway)
|
||||
"alN" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/extinguisher_cabinet{dir = 1; icon_state = "extinguisher_closed"; pixel_y = 32},/obj/vehicle/train/trolley,/turf/simulated/floor/tiled/monotile,/area/engineering/hallway)
|
||||
"alQ" = (/turf/simulated/wall/r_wall,/area/maintenance/substation/civilian)
|
||||
"alR" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/obj/vehicle/train/cargo/trolley,/turf/simulated/floor/tiled/monotile,/area/engineering/hallway)
|
||||
"alR" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/obj/vehicle/train/trolley,/turf/simulated/floor/tiled/monotile,/area/engineering/hallway)
|
||||
"alT" = (/turf/simulated/wall,/area/storage/emergency_storage/emergency4)
|
||||
"alW" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/steeldecal/steel_decals_central6{icon_state = "steel_decals_central6"; dir = 8},/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/vehicle/train/cargo/engine,/turf/simulated/floor/tiled/monotile,/area/engineering/hallway)
|
||||
"alW" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/steeldecal/steel_decals_central6{icon_state = "steel_decals_central6"; dir = 8},/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/vehicle/train/engine,/turf/simulated/floor/tiled/monotile,/area/engineering/hallway)
|
||||
"alX" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring)
|
||||
"alZ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/hallway)
|
||||
"amb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/hallway)
|
||||
@@ -482,7 +482,7 @@
|
||||
"aoq" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/turf/simulated/floor/tiled,/area/engineering/hallway)
|
||||
"aor" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/yellow/border{dir = 9},/turf/simulated/floor/tiled,/area/engineering/hallway)
|
||||
"aot" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance/engi{name = "Engineering Electrical Shaft"; req_one_access = list(10)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/hallway)
|
||||
"aow" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/light{dir = 1},/obj/vehicle/train/cargo/trolley,/turf/simulated/floor/tiled/monotile,/area/engineering/hallway)
|
||||
"aow" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/light{dir = 1},/obj/vehicle/train/trolley,/turf/simulated/floor/tiled/monotile,/area/engineering/hallway)
|
||||
"aoy" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/engineering/hallway)
|
||||
"aoB" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/engineering/hallway)
|
||||
"aoF" = (/obj/machinery/status_display,/turf/simulated/wall/r_wall,/area/engineering/break_room)
|
||||
@@ -702,7 +702,7 @@
|
||||
"ava" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner_techfloor_grid{dir = 4},/obj/effect/floor_decal/techfloor/corner{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/cryo)
|
||||
"avb" = (/obj/machinery/computer/cryopod{pixel_y = 32},/obj/effect/floor_decal/techfloor{dir = 5},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/cryo)
|
||||
"avc" = (/obj/machinery/cryopod/robot,/obj/effect/floor_decal/corner_techfloor_grid{dir = 5},/obj/effect/floor_decal/corner_techfloor_grid{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/cryo)
|
||||
"avd" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/table/reinforced,/obj/item/weapon/crowbar,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/tiled,/area/engineering/workshop)
|
||||
"avd" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/tiled,/area/engineering/workshop)
|
||||
"avf" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/airless,/area/space)
|
||||
"avg" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/turf/simulated/floor/tiled,/area/engineering/workshop)
|
||||
"avh" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/workshop)
|
||||
@@ -836,7 +836,7 @@
|
||||
"azn" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled/dark,/area/bridge)
|
||||
"azo" = (/obj/machinery/computer/station_alert{dir = 8},/turf/simulated/floor/tiled/dark,/area/bridge)
|
||||
"azp" = (/obj/machinery/computer/security{dir = 4},/turf/simulated/floor/tiled/dark,/area/bridge)
|
||||
"azq" = (/obj/machinery/computer/ordercomp{dir = 8},/turf/simulated/floor/tiled/dark,/area/bridge)
|
||||
"azq" = (/obj/machinery/computer/supplycomp/control{dir = 8},/turf/simulated/floor/tiled/dark,/area/bridge)
|
||||
"azr" = (/obj/machinery/computer/crew{dir = 4},/turf/simulated/floor/tiled/dark,/area/bridge)
|
||||
"azv" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/blue/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/bridge_hallway)
|
||||
"azy" = (/mob/living/simple_animal/corgi/Ian,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop)
|
||||
@@ -969,7 +969,7 @@
|
||||
"aCM" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering EVA Storage"; req_one_access = list(11,24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/workshop)
|
||||
"aCN" = (/obj/machinery/door/airlock/glass,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/steel_grid,/area/tether/station/dock_two)
|
||||
"aCO" = (/turf/simulated/wall/r_wall,/area/crew_quarters/captain)
|
||||
"aCP" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/wrench,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/tiled,/area/engineering/workshop)
|
||||
"aCP" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/tool/wrench,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/tiled,/area/engineering/workshop)
|
||||
"aCQ" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/machinery/light_switch{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled,/area/engineering/workshop)
|
||||
"aCR" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{icon_state = "map"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/hallway)
|
||||
"aCS" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/blue/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/camera/network/command{c_tag = "Bridge Hallway Central"; dir = 4},/turf/simulated/floor/tiled,/area/bridge_hallway)
|
||||
@@ -1136,7 +1136,7 @@
|
||||
"aIa" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/floor/wood,/area/library_conference_room)
|
||||
"aIb" = (/turf/space,/area/shuttle/antag_space/docks)
|
||||
"aIc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
|
||||
"aId" = (/obj/structure/closet/crate,/obj/item/weapon/crowbar,/turf/simulated/floor/tiled,/area/teleporter)
|
||||
"aId" = (/obj/structure/closet/crate,/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled,/area/teleporter)
|
||||
"aIf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Workshop"; req_access = newlist(); req_one_access = list(14,24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/workshop)
|
||||
"aIh" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/teleporter)
|
||||
"aIi" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{icon_state = "intact"; dir = 9},/turf/simulated/floor/tiled,/area/engineering/hallway)
|
||||
@@ -1812,7 +1812,7 @@
|
||||
"bYE" = (/obj/machinery/recharge_station,/turf/simulated/floor/carpet,/area/engineering/foyer)
|
||||
"bYJ" = (/obj/effect/floor_decal/techfloor{dir = 10},/obj/machinery/telecomms/relay/preset/tether/station_high,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief)
|
||||
"bYK" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/machinery/telecomms/relay/preset/tether/station_low,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief)
|
||||
"bYN" = (/obj/item/device/violin,/turf/simulated/floor,/area/vacant/vacant_restaurant_lower)
|
||||
"bYN" = (/obj/item/device/instrument/violin,/turf/simulated/floor,/area/vacant/vacant_restaurant_lower)
|
||||
"bYP" = (/turf/simulated/wall,/area/vacant/vacant_restaurant_lower)
|
||||
"bYR" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/vacant/vacant_restaurant_lower)
|
||||
"bZc" = (/obj/structure/table/reinforced,/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/material/glass/phoronrglass{amount = 20},/obj/item/stack/material/wood{amount = 50},/obj/machinery/camera/network/engineering{dir = 1},/turf/simulated/floor/tiled,/area/engineering/workshop)
|
||||
|
||||
@@ -1180,7 +1180,7 @@
|
||||
"yq" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/red,/turf/simulated/floor/carpet/sblucarpet,/area/bridge/meeting_room)
|
||||
"yr" = (/obj/structure/bed/chair/comfy/black{dir = 8},/obj/effect/landmark/start{name = "Command Secretary"},/turf/simulated/floor/carpet/sblucarpet,/area/bridge/meeting_room)
|
||||
"ys" = (/obj/machinery/camera/network/command{c_tag = "Command Meeting Room East"; dir = 9},/turf/simulated/floor/wood,/area/bridge/meeting_room)
|
||||
"yt" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/weapon/wrench,/turf/simulated/floor/tiled/steel,/area/medical/biostorage)
|
||||
"yt" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/weapon/tool/wrench,/turf/simulated/floor/tiled/steel,/area/medical/biostorage)
|
||||
"yu" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9; icon_state = "intact"},/turf/simulated/floor/tiled,/area/medical/biostorage)
|
||||
"yv" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/medical/biostorage)
|
||||
"yw" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/o2{pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/corner/blue/full,/turf/simulated/floor/tiled,/area/medical/biostorage)
|
||||
@@ -1416,7 +1416,7 @@
|
||||
"CU" = (/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/effect/floor_decal/spline/plain{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
|
||||
"CV" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak)
|
||||
"CW" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/machinery/light,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum})
|
||||
"CX" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/wrench,/obj/random/medical/lite,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum})
|
||||
"CX" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/tool/wrench,/obj/random/medical/lite,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum})
|
||||
"CY" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/item/device/defib_kit/loaded,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum})
|
||||
"CZ" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum})
|
||||
"Da" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum})
|
||||
|
||||
@@ -4788,8 +4788,8 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/wrench,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/wrench,
|
||||
/obj/item/weapon/hand_labeler,
|
||||
/obj/structure/sign/department/armory{
|
||||
color = "#3385ff";
|
||||
@@ -7306,12 +7306,12 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table/steel,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/device/flashlight,
|
||||
/obj/item/device/flashlight,
|
||||
/obj/item/device/flashlight,
|
||||
@@ -12678,7 +12678,7 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/foyer)
|
||||
"uB" = (
|
||||
/obj/machinery/computer/ordercomp,
|
||||
/obj/machinery/computer/supplycomp/control,
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 5
|
||||
},
|
||||
@@ -18914,7 +18914,7 @@
|
||||
/area/quartermaster/qm)
|
||||
"Et" = (
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/vehicle/train/cargo/engine,
|
||||
/obj/vehicle/train/engine,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
@@ -19309,7 +19309,7 @@
|
||||
/area/quartermaster/warehouse)
|
||||
"Fk" = (
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/vehicle/train/cargo/trolley,
|
||||
/obj/vehicle/train/trolley,
|
||||
/obj/machinery/alarm{
|
||||
dir = 4;
|
||||
icon_state = "alarm0";
|
||||
@@ -19605,7 +19605,7 @@
|
||||
/area/medical/chemistry)
|
||||
"FJ" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/weapon/screwdriver,
|
||||
/obj/item/weapon/tool/screwdriver,
|
||||
/obj/item/stack/material/phoron,
|
||||
/obj/item/stack/material/phoron,
|
||||
/obj/item/stack/material/phoron,
|
||||
@@ -19858,7 +19858,7 @@
|
||||
/area/quartermaster/warehouse)
|
||||
"Gd" = (
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/vehicle/train/cargo/trolley,
|
||||
/obj/vehicle/train/trolley,
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
@@ -20221,7 +20221,7 @@
|
||||
/area/quartermaster/warehouse)
|
||||
"GK" = (
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/vehicle/train/cargo/trolley,
|
||||
/obj/vehicle/train/trolley,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
@@ -23392,7 +23392,7 @@
|
||||
/area/medical/sleeper)
|
||||
"LR" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/weapon/screwdriver,
|
||||
/obj/item/weapon/tool/screwdriver,
|
||||
/obj/item/weapon/storage/pill_bottle/tramadol,
|
||||
/obj/item/weapon/storage/pill_bottle/antitox,
|
||||
/obj/item/weapon/reagent_containers/syringe/antiviral,
|
||||
|
||||
+199
-20283
File diff suppressed because it is too large
Load Diff
@@ -1317,7 +1317,7 @@
|
||||
},
|
||||
/obj/item/stack/cable_coil,
|
||||
/obj/item/stack/cable_coil,
|
||||
/obj/item/weapon/wirecutters,
|
||||
/obj/item/weapon/tool/wirecutters,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/testing)
|
||||
"cS" = (
|
||||
@@ -1762,7 +1762,7 @@
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/weapon/screwdriver,
|
||||
/obj/item/weapon/tool/screwdriver,
|
||||
/obj/item/device/assembly_holder/timer_igniter,
|
||||
/obj/machinery/camera/network/research_outpost{
|
||||
dir = 4
|
||||
@@ -2894,14 +2894,14 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/wrench{
|
||||
/obj/item/weapon/tool/wrench{
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple{
|
||||
dir = 10
|
||||
},
|
||||
/obj/item/weapon/wrench{
|
||||
/obj/item/weapon/tool/wrench{
|
||||
pixel_x = -2;
|
||||
pixel_y = -2
|
||||
},
|
||||
@@ -3443,7 +3443,7 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on,
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/wrench,
|
||||
/obj/item/weapon/tool/wrench,
|
||||
/obj/machinery/camera/network/research_outpost{
|
||||
dir = 8
|
||||
},
|
||||
@@ -3460,7 +3460,7 @@
|
||||
pixel_y = 24;
|
||||
req_access = list()
|
||||
},
|
||||
/obj/item/weapon/wrench,
|
||||
/obj/item/weapon/tool/wrench,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/outpost/heating)
|
||||
"gB" = (
|
||||
|
||||
@@ -1497,12 +1497,12 @@
|
||||
/area/centcom/specops)
|
||||
"cr" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/device/radio/off,
|
||||
/obj/item/device/radio/off,
|
||||
/obj/item/device/radio/off,
|
||||
@@ -1923,12 +1923,12 @@
|
||||
/area/centcom/specops)
|
||||
"cZ" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/screwdriver,
|
||||
/obj/item/weapon/wrench,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/screwdriver,
|
||||
/obj/item/weapon/wrench,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/screwdriver,
|
||||
/obj/item/weapon/tool/wrench,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/screwdriver,
|
||||
/obj/item/weapon/tool/wrench,
|
||||
/obj/effect/floor_decal/industrial/outline/blue,
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "dark"
|
||||
@@ -2911,7 +2911,7 @@
|
||||
pixel_x = -2;
|
||||
pixel_y = -1
|
||||
},
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/storage/belt/utility,
|
||||
/obj/item/weapon/storage/toolbox/electrical{
|
||||
pixel_x = 1;
|
||||
@@ -4696,7 +4696,7 @@
|
||||
},
|
||||
/area/tdome/tdome1)
|
||||
"iC" = (
|
||||
/obj/machinery/computer/ordercomp{
|
||||
/obj/machinery/computer/supplycomp/control{
|
||||
dir = 4
|
||||
},
|
||||
/turf/unsimulated/floor/steel,
|
||||
@@ -6893,7 +6893,7 @@
|
||||
pixel_x = 7;
|
||||
pixel_y = 1
|
||||
},
|
||||
/obj/item/weapon/wrench,
|
||||
/obj/item/weapon/tool/wrench,
|
||||
/obj/effect/floor_decal/borderfloorwhite{
|
||||
dir = 9
|
||||
},
|
||||
@@ -8207,12 +8207,12 @@
|
||||
/obj/item/device/flashlight,
|
||||
/obj/item/device/flashlight,
|
||||
/obj/item/device/flashlight,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/item/weapon/tool/crowbar,
|
||||
/obj/machinery/recharger/wallcharger{
|
||||
pixel_x = 4;
|
||||
pixel_y = 26
|
||||
|
||||
@@ -116,7 +116,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior
|
||||
"processing" = program.memory["processing"]
|
||||
)
|
||||
|
||||
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||
ui = GLOB.nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||
if (!ui)
|
||||
ui = new(user, src, ui_key, "phoron_airlock_console.tmpl", name, 470, 290)
|
||||
ui.set_initial_data(data)
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
// Telecommunications Satellite
|
||||
/area/tether/surfacebase/tcomms
|
||||
name = "\improper Telecomms"
|
||||
ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
|
||||
ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/generic/generic1.ogg')
|
||||
|
||||
/area/tether/surfacebase/tcomms/entrance
|
||||
name = "\improper Telecomms Teleporter"
|
||||
|
||||
+1
-1
@@ -2850,9 +2850,9 @@
|
||||
#include "code\modules\vehicles\bike.dm"
|
||||
#include "code\modules\vehicles\boat.dm"
|
||||
#include "code\modules\vehicles\cargo_train.dm"
|
||||
#include "code\modules\vehicles\Securitrain_vr.dm"
|
||||
#include "code\modules\vehicles\construction.dm"
|
||||
#include "code\modules\vehicles\quad.dm"
|
||||
#include "code\modules\vehicles\Securitrain_vr.dm"
|
||||
#include "code\modules\vehicles\train.dm"
|
||||
#include "code\modules\vehicles\vehicle.dm"
|
||||
#include "code\modules\ventcrawl\ventcrawl.dm"
|
||||
|
||||
Reference in New Issue
Block a user