mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-28 22:48:38 +01:00
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes
This commit is contained in:
@@ -106,7 +106,7 @@
|
||||
|
||||
/obj/effect/energy_net/New()
|
||||
..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/effect/energy_net/Destroy()
|
||||
if(has_buckled_mobs())
|
||||
@@ -136,7 +136,7 @@
|
||||
/obj/effect/energy_net/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
|
||||
user.setClickCooldown(user.get_attack_speed())
|
||||
visible_message("<span class='danger'>[user] begins to tear at \the [src]!</span>")
|
||||
if(do_after(usr, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
|
||||
if(do_after(user, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
|
||||
if(!has_buckled_mobs())
|
||||
return
|
||||
visible_message("<span class='danger'>[user] manages to tear \the [src] apart!</span>")
|
||||
|
||||
@@ -34,6 +34,50 @@ GLOBAL_LIST_INIT(indoor_fishing_junk_list, list(
|
||||
junk_list = GLOB.indoor_fishing_junk_list
|
||||
fishing_loot = GLOB.indoor_fishing_chance_list
|
||||
|
||||
// Ocean fishing
|
||||
GLOBAL_LIST_INIT(ocean_fishing_chance_list, list(FISHING_RARE = 5, FISHING_UNCOMMON = 20, FISHING_COMMON = 30, FISHING_JUNK = 40, FISHING_NOTHING = 5)) // the ocean is teeming with life... and junk
|
||||
GLOBAL_LIST_INIT(ocean_fishing_rare_list, list(
|
||||
/mob/living/simple_mob/animal/passive/fish/solarfish = 1,
|
||||
/mob/living/simple_mob/animal/passive/fish/measelshark = 10
|
||||
))
|
||||
|
||||
GLOBAL_LIST_INIT(ocean_fishing_uncommon_list, list(
|
||||
/mob/living/simple_mob/animal/passive/crab/sif = 1,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 10
|
||||
))
|
||||
|
||||
GLOBAL_LIST_INIT(ocean_fishing_common_list, list(
|
||||
/mob/living/simple_mob/animal/passive/fish/rockfish = 5,
|
||||
/mob/living/simple_mob/animal/passive/crab = 1,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 10,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/lobster = 8
|
||||
))
|
||||
|
||||
/turf/simulated/floor/water/ocean
|
||||
min_fishing_time = 30
|
||||
max_fishing_time = 90
|
||||
|
||||
/turf/simulated/floor/water/ocean/handle_fish()
|
||||
if(has_fish)
|
||||
rare_fish_list = GLOB.ocean_fishing_rare_list
|
||||
uncommon_fish_list = GLOB.ocean_fishing_uncommon_list
|
||||
common_fish_list = GLOB.ocean_fishing_common_list
|
||||
junk_list = GLOB.generic_fishing_junk_list
|
||||
fishing_loot = GLOB.ocean_fishing_chance_list
|
||||
|
||||
/turf/simulated/floor/water/deep/ocean
|
||||
min_fishing_time = 20
|
||||
max_fishing_time = 80
|
||||
|
||||
/turf/simulated/floor/water/deep/ocean/handle_fish()
|
||||
if(has_fish)
|
||||
rare_fish_list = GLOB.ocean_fishing_rare_list
|
||||
uncommon_fish_list = GLOB.ocean_fishing_uncommon_list
|
||||
common_fish_list = GLOB.ocean_fishing_common_list
|
||||
junk_list = GLOB.generic_fishing_junk_list
|
||||
fishing_loot = GLOB.ocean_fishing_chance_list
|
||||
|
||||
|
||||
|
||||
#undef FISHING_RARE
|
||||
#undef FISHING_UNCOMMON
|
||||
|
||||
@@ -384,6 +384,77 @@
|
||||
bitesize = 0.01 //impossible to eat
|
||||
reagents.add_reagent("carbon", 5)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk
|
||||
name = "chunk of shark meat"
|
||||
desc = "still rough, needs to be cut into even smaller chunks."
|
||||
icon = 'icons/obj/food_vr.dmi'
|
||||
icon_state = "sharkmeat_chunk"
|
||||
nutriment_amt = 15
|
||||
w_class = ITEMSIZE_LARGE
|
||||
slice_path = /obj/item/weapon/reagent_containers/food/snacks/sharkmeat
|
||||
slices_num = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize()
|
||||
..()
|
||||
bitesize = 3
|
||||
reagents.add_reagent("protein", 20)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
|
||||
name = "a slice of sharkmeat"
|
||||
desc = "now it's small enough to cook with."
|
||||
icon = 'icons/obj/food_vr.dmi'
|
||||
icon_state = "sharkmeat"
|
||||
nutriment_amt = 2
|
||||
toxin_amount = null
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sharkmeat/Initialize()
|
||||
..()
|
||||
bitesize = 3
|
||||
reagents.add_reagent("protein", 2)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked
|
||||
name = "shark steak"
|
||||
desc = "finally, some food for real men."
|
||||
icon = 'icons/obj/food_vr.dmi'
|
||||
icon_state = "sharkmeat_cooked"
|
||||
nutriment_amt = 5
|
||||
trash = /obj/item/trash/plate
|
||||
nutriment_desc = list("manliness" = 1, "fish oil" = 2, "shark" = 2)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked/Initialize()
|
||||
..()
|
||||
bitesize = 3
|
||||
reagents.add_reagent("protein", 8)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip
|
||||
name = "hot shark shank"
|
||||
desc = "a shank of shark meat dipped in hot sauce."
|
||||
icon = 'icons/obj/food_vr.dmi'
|
||||
icon_state = "sharkmeat_dip"
|
||||
nutriment_amt = 5
|
||||
trash = /obj/item/trash/snack_bowl
|
||||
nutriment_desc = list("salt" = 1, "fish oil" = 2, "spicy shark" = 2)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip/Initialize()
|
||||
..()
|
||||
bitesize = 3
|
||||
reagents.add_reagent("capsaicin", 4)
|
||||
reagents.add_reagent("protein", 4)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes
|
||||
name = "shark cubes"
|
||||
desc = "foul scented fermented shark cubes, it's said to make men fly, or just make them really fat."
|
||||
icon = 'icons/obj/food_vr.dmi'
|
||||
icon_state = "sharkmeat_cubes"
|
||||
nutriment_amt = 8
|
||||
trash = /obj/item/trash/plate
|
||||
nutriment_desc = list("viking spirit" = 1, "rot" = 2, "fermented sauce" = 2)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes/Initialize()
|
||||
..()
|
||||
bitesize = 10
|
||||
reagents.add_reagent("potatojuice", 30) // for people who want to get fat, FAST.
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube
|
||||
name = "sobaka cube"
|
||||
monkey_type = "Sobaka"
|
||||
|
||||
@@ -173,6 +173,29 @@
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/monkfishcooked
|
||||
|
||||
/datum/recipe/sharksteak
|
||||
reagents = list("blackpepper"= 1, "sodiumchloride" = 1)
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked
|
||||
|
||||
/datum/recipe/sharkdip
|
||||
reagents = list("sodiumchloride" = 1)
|
||||
fruit = list("chili" = 1)
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip
|
||||
|
||||
/datum/recipe/sharkcubes
|
||||
reagents = list("soysauce" = 5, "sodiumchloride" = 1)
|
||||
fruit = list("potato" = 1)
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes
|
||||
|
||||
/datum/recipe/margheritapizzacargo
|
||||
reagents = list()
|
||||
items = list(
|
||||
|
||||
@@ -290,7 +290,7 @@
|
||||
/mob/living/carbon/can_use_hands()
|
||||
if(handcuffed)
|
||||
return 0
|
||||
if(buckled && ! istype(buckled, /obj/structure/bed/chair)) // buckling does not restrict hands
|
||||
if(buckled && istype(buckled, /obj/structure/bed/nest)) // buckling does not restrict hands
|
||||
return 0
|
||||
return 1
|
||||
|
||||
|
||||
@@ -1112,10 +1112,11 @@ default behaviour is:
|
||||
pixel_y = V.mob_offset_y
|
||||
else if(buckled)
|
||||
anchored = 1
|
||||
canmove = 0
|
||||
canmove = 1 //The line above already makes the chair not swooce away if the sitter presses a button. No need to incapacitate them as a criminally large amount of mechanics read this var as a type of stun.
|
||||
if(istype(buckled))
|
||||
if(buckled.buckle_lying != -1)
|
||||
lying = buckled.buckle_lying
|
||||
canmove = buckled.buckle_movable
|
||||
if(buckled.buckle_movable)
|
||||
anchored = 0
|
||||
canmove = 1
|
||||
|
||||
@@ -57,4 +57,19 @@
|
||||
return 0
|
||||
M.reagents.add_reagent("toxin", 2)
|
||||
M.reagents.add_reagent("impedrezene", 1)
|
||||
return 1
|
||||
return 1
|
||||
|
||||
/mob/living/simple_mob/animal/passive/fish/measelshark
|
||||
name = "Measel Shark"
|
||||
tt_desc = "Spot Pistris"
|
||||
desc = "An evil measel shark that refuses to get vaccinated, causing other fish to get fish measels."
|
||||
icon = 'icons/mob/shark.dmi'
|
||||
icon_state = "measelshark"
|
||||
icon_living = "measelshark"
|
||||
icon_dead = "measelshark-dead"
|
||||
meat_amount = 6 //Big fish, tons of meat. Great for feasts.
|
||||
meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk
|
||||
vore_bump_chance = 100
|
||||
vore_default_mode = DM_HOLD //docile shark
|
||||
vore_capacity = 5
|
||||
pixel_x = -50
|
||||
@@ -118,6 +118,37 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
|
||||
|
||||
SSnanoui.update_uis(src)
|
||||
|
||||
/obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob)
|
||||
if(istype(O, /obj/item/weapon/paper) || istype(O, /obj/item/weapon/photo) || istype(O, /obj/item/weapon/paper_bundle))
|
||||
if(!copyitem)
|
||||
user.drop_item()
|
||||
copyitem = O
|
||||
O.loc = src
|
||||
to_chat(user, "<span class='notice'>You insert \the [O] into \the [src].</span>")
|
||||
playsound(loc, "sound/machines/click.ogg", 100, 1)
|
||||
flick(insert_anim, src)
|
||||
else
|
||||
to_chat(user, "<span class='notice'>There is already something in \the [src].</span>")
|
||||
else if(istype(O, /obj/item/device/multitool) && panel_open)
|
||||
var/input = sanitize(input(usr, "What Department ID would you like to give this fax machine?", "Multitool-Fax Machine Interface", department))
|
||||
if(!input)
|
||||
to_chat(usr, "No input found. Please hang up and try your call again.")
|
||||
return
|
||||
department = input
|
||||
if( !(("[department]" in alldepartments) || ("[department]" in admin_departments)) && !(department == "Unknown"))
|
||||
alldepartments |= department
|
||||
else if(O.is_wrench())
|
||||
playsound(loc, O.usesound, 50, 1)
|
||||
anchored = !anchored
|
||||
to_chat(user, "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
|
||||
|
||||
else if(default_deconstruction_screwdriver(user, O))
|
||||
return
|
||||
else if(default_deconstruction_crowbar(user, O))
|
||||
return
|
||||
|
||||
return
|
||||
|
||||
/obj/machinery/photocopier/faxmachine/proc/sendfax(var/destination)
|
||||
if(stat & (BROKEN|NOPOWER))
|
||||
return
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 24 KiB |
+3358
-3354
File diff suppressed because it is too large
Load Diff
@@ -143,6 +143,7 @@
|
||||
/obj/item/weapon/storage/toolbox/electrical,
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
pixel_x = -24
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
/area/awaymission/snowfield/base)
|
||||
"ar" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 8;
|
||||
name = "west bump-derelict";
|
||||
operating = 0;
|
||||
|
||||
@@ -66,4 +66,20 @@
|
||||
|
||||
/area/tether_away/debrisfield/derelict
|
||||
icon_state = "debrisexplored"
|
||||
forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg')
|
||||
forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg')
|
||||
|
||||
//TFF 26/12/19 - Sub-areas for the APCs.
|
||||
/area/tether_away/debrisfield/derelict/ai_access_port
|
||||
name = "POI - Abandoned Derelict AI Acess Port"
|
||||
|
||||
/area/tether_away/debrisfield/derelict/ai_access_starboard
|
||||
name = "POI - Abandoned Derelict AI Access Starboard"
|
||||
|
||||
/area/tether_away/debrisfield/derelict/ai_chamber
|
||||
name = "POI - Abandoned Derelict AI Chamber"
|
||||
|
||||
/area/tether_away/debrisfield/derelict/bridge
|
||||
name = "POI - Abandoned Derelict Bridge"
|
||||
|
||||
/area/tether_away/debrisfield/derelict/interior
|
||||
name = "POI - Abandoned Derelict Interior"
|
||||
+1842
-1752
File diff suppressed because it is too large
Load Diff
@@ -5534,7 +5534,6 @@
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/tether/surfacebase/surface_two_hall)
|
||||
"alw" = (
|
||||
/obj/effect/floor_decal/rust,
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
|
||||
@@ -5311,7 +5311,7 @@
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/crew_quarters/recreation_area_restroom)
|
||||
"aiI" = (
|
||||
/obj/structure/sink{
|
||||
|
||||
@@ -2899,13 +2899,27 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/engine_monitoring)
|
||||
"afl" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals4{
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 1;
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals4{
|
||||
dir = 9
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/bordercorner2{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/bordercorner2{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
@@ -3090,19 +3104,16 @@
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 4;
|
||||
icon_state = "borderfloorcorner2";
|
||||
pixel_y = 0
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/device/radio{
|
||||
pixel_x = -2;
|
||||
pixel_y = -2
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/bordercorner2{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
/obj/item/device/radio{
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/machinery/camera/network/command,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
"afx" = (
|
||||
@@ -3319,26 +3330,16 @@
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7,
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/bordercorner2{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/device/radio{
|
||||
pixel_x = -2;
|
||||
pixel_y = -2
|
||||
},
|
||||
/obj/item/device/radio{
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/machinery/camera/network/command,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
"afS" = (
|
||||
@@ -4280,9 +4281,17 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
"ahh" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals4{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals4{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
@@ -4295,15 +4304,23 @@
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/bridge/secondary/teleporter)
|
||||
"ahk" = (
|
||||
/obj/structure/disposalpipe/trunk{
|
||||
dir = 8
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/photocopier/faxmachine{
|
||||
department = "Secondary Command Office"
|
||||
},
|
||||
/obj/machinery/disposal,
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 6
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 6
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 4;
|
||||
icon_state = "borderfloorcorner2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/bordercorner2{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
@@ -8077,6 +8094,8 @@
|
||||
dir = 2;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
"aon" = (
|
||||
@@ -10402,17 +10421,16 @@
|
||||
/area/crew_quarters/sleep/cryo)
|
||||
"asM" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 10
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
"asN" = (
|
||||
@@ -12261,15 +12279,18 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/station/visitorhallway)
|
||||
"awg" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/photocopier/faxmachine{
|
||||
department = "Secondary Command Office"
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 5
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 5
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
icon_state = "map-scrubbers";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
@@ -12697,7 +12718,7 @@
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary/teleporter)
|
||||
"awO" = (
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
@@ -12868,7 +12889,7 @@
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/bridge/secondary/meeting_room)
|
||||
"axd" = (
|
||||
/obj/structure/bed/chair/comfy/black,
|
||||
@@ -14185,13 +14206,18 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
"azd" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
/obj/structure/disposalpipe/trunk{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/disposal,
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/border{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/corner2,
|
||||
/obj/effect/floor_decal/corner/blue/bordercorner2,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
"aze" = (
|
||||
@@ -14973,12 +14999,6 @@
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary/hallway)
|
||||
"aAv" = (
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/secondary)
|
||||
"aAw" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
@@ -34221,7 +34241,7 @@ acT
|
||||
aCX
|
||||
aCr
|
||||
acV
|
||||
aAv
|
||||
afl
|
||||
agn
|
||||
agn
|
||||
agn
|
||||
@@ -34653,7 +34673,7 @@ aep
|
||||
aeJ
|
||||
aeT
|
||||
acV
|
||||
afR
|
||||
afw
|
||||
agE
|
||||
azc
|
||||
ahe
|
||||
@@ -34795,9 +34815,9 @@ aeu
|
||||
aej
|
||||
aeY
|
||||
afh
|
||||
afl
|
||||
ahh
|
||||
azd
|
||||
afR
|
||||
agE
|
||||
asM
|
||||
azg
|
||||
ahn
|
||||
avY
|
||||
@@ -34937,9 +34957,9 @@ aej
|
||||
aeK
|
||||
aeZ
|
||||
afv
|
||||
afw
|
||||
ahh
|
||||
aom
|
||||
asM
|
||||
awg
|
||||
axL
|
||||
afV
|
||||
aqx
|
||||
@@ -35079,10 +35099,10 @@ aev
|
||||
aej
|
||||
afa
|
||||
afx
|
||||
awg
|
||||
ahk
|
||||
agt
|
||||
agG
|
||||
ahk
|
||||
azd
|
||||
acV
|
||||
awh
|
||||
asF
|
||||
|
||||
@@ -265,6 +265,7 @@
|
||||
pixel_x = 12;
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/structure/closet/secure_closet/miner,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/break_room)
|
||||
"aL" = (
|
||||
@@ -426,14 +427,29 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/break_room)
|
||||
"aZ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/border{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 9;
|
||||
pixel_y = 0
|
||||
/obj/machinery/firealarm{
|
||||
dir = 2;
|
||||
layer = 3.3;
|
||||
pixel_x = 0;
|
||||
pixel_y = 26
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/closet/secure_closet/miner,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/break_room)
|
||||
"ba" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
@@ -493,31 +509,17 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/outpost/mining_main/maintenance)
|
||||
"bg" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 9;
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/structure/bed/chair{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/border{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 2;
|
||||
layer = 3.3;
|
||||
pixel_x = 0;
|
||||
pixel_y = 26
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/outpost/mining_main/break_room)
|
||||
"bh" = (
|
||||
/obj/structure/table/glass,
|
||||
@@ -551,6 +553,9 @@
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/item/weapon/storage/box/donkpockets,
|
||||
/obj/machinery/vending/wallmed1{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/break_room)
|
||||
"bj" = (
|
||||
@@ -778,6 +783,45 @@
|
||||
},
|
||||
/turf/simulated/floor/bluegrid,
|
||||
/area/outpost/mining_main/airlock)
|
||||
"bK" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/border{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/vending/wallmed_airlock{
|
||||
pixel_x = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/break_room)
|
||||
"bL" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/border{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/bordercorner2{
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/break_room)
|
||||
"bW" = (
|
||||
/obj/effect/floor_decal/borderfloor,
|
||||
/obj/effect/floor_decal/corner/brown/border,
|
||||
@@ -1321,44 +1365,6 @@
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/outpost/mining_main/dorms)
|
||||
"WV" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/border{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/corner2{
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/bordercorner2{
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/closet/secure_closet/miner,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/break_room)
|
||||
"YA" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/brown/border{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/closet/secure_closet/miner,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/break_room)
|
||||
"Zn" = (
|
||||
/obj/effect/floor_decal/borderfloorblack,
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
@@ -4938,7 +4944,7 @@ at
|
||||
qx
|
||||
aC
|
||||
aE
|
||||
bg
|
||||
aZ
|
||||
bv
|
||||
ZV
|
||||
ty
|
||||
@@ -5081,7 +5087,7 @@ ao
|
||||
ao
|
||||
VK
|
||||
aM
|
||||
aZ
|
||||
bg
|
||||
Uk
|
||||
Uk
|
||||
by
|
||||
@@ -5224,8 +5230,8 @@ ab
|
||||
VK
|
||||
Uy
|
||||
hW
|
||||
YA
|
||||
WV
|
||||
bK
|
||||
bL
|
||||
by
|
||||
US
|
||||
az
|
||||
|
||||
@@ -394,6 +394,18 @@
|
||||
},
|
||||
/turf/simulated/floor/outdoors/dirt/virgo3b,
|
||||
/area/tether/outpost/solars_outside)
|
||||
"aQ" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/vending/wallmed_airlock{
|
||||
pixel_x = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost)
|
||||
"aR" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/power/solar_control,
|
||||
@@ -6767,9 +6779,14 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
"mm" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/item/weapon/storage/box/donkpockets,
|
||||
/obj/machinery/light_switch{
|
||||
dir = 4;
|
||||
pixel_x = -28
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
/area/rnd/outpost/breakroom)
|
||||
"mn" = (
|
||||
/obj/machinery/washing_machine,
|
||||
/obj/structure/window/reinforced{
|
||||
@@ -7166,14 +7183,10 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
"mV" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/reagent_containers/glass/beaker/large,
|
||||
/obj/item/weapon/reagent_containers/dropper,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
/obj/effect/floor_decal/rust,
|
||||
/obj/structure/reagent_dispensers/coolanttank,
|
||||
/turf/simulated/floor/tiled/steel_dirty,
|
||||
/area/rnd/outpost/storage)
|
||||
"mW" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 4
|
||||
@@ -7237,13 +7250,12 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
"nf" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/storage/box/beakers,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/vending/wallmed1{
|
||||
pixel_x = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
/area/rnd/outpost/breakroom)
|
||||
"ng" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner,
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
@@ -7257,11 +7269,12 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
"ni" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/machinery/chemical_dispenser/full,
|
||||
/obj/machinery/light,
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
/area/rnd/outpost/breakroom)
|
||||
"nj" = (
|
||||
/obj/structure/filingcabinet/chestdrawer,
|
||||
/obj/structure/window/reinforced{
|
||||
@@ -7759,14 +7772,12 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/xenoarch_storage)
|
||||
"of" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border{
|
||||
dir = 4
|
||||
/obj/structure/table/standard,
|
||||
/obj/machinery/vending/wallmed1{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost)
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
"og" = (
|
||||
/obj/structure/dispenser/oxygen,
|
||||
/turf/simulated/floor/tiled,
|
||||
@@ -7910,10 +7921,12 @@
|
||||
/turf/simulated/floor/wood,
|
||||
/area/rnd/outpost/breakroom)
|
||||
"ow" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/item/weapon/storage/box/donkpockets,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/breakroom)
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
"ox" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 1
|
||||
@@ -7984,10 +7997,13 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/breakroom)
|
||||
"oH" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/microwave,
|
||||
/obj/structure/table/standard,
|
||||
/obj/machinery/light,
|
||||
/obj/item/weapon/storage/box/beakers,
|
||||
/obj/item/weapon/reagent_containers/glass/beaker/large,
|
||||
/obj/item/weapon/reagent_containers/dropper,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/breakroom)
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
"oI" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/microwave,
|
||||
@@ -8073,6 +8089,17 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
"oS" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/reagent_dispensers/acid{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/machinery/reagentgrinder,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/anomaly_lab)
|
||||
"oT" = (
|
||||
/obj/structure/bed/chair/wood{
|
||||
dir = 8
|
||||
@@ -8117,18 +8144,6 @@
|
||||
/obj/structure/sign/science,
|
||||
/turf/simulated/wall,
|
||||
/area/rnd/outpost/breakroom)
|
||||
"pa" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
dir = 4;
|
||||
pixel_x = -28
|
||||
},
|
||||
/obj/item/weapon/storage/box/donkpockets,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/outpost/breakroom)
|
||||
"pb" = (
|
||||
/obj/machinery/alarm{
|
||||
dir = 8;
|
||||
@@ -22502,7 +22517,7 @@ jE
|
||||
ml
|
||||
mG
|
||||
mU
|
||||
ni
|
||||
oH
|
||||
jx
|
||||
ab
|
||||
ab
|
||||
@@ -22641,10 +22656,10 @@ ng
|
||||
nV
|
||||
lH
|
||||
jE
|
||||
mm
|
||||
of
|
||||
mG
|
||||
mV
|
||||
nf
|
||||
ow
|
||||
oS
|
||||
jx
|
||||
ab
|
||||
ab
|
||||
@@ -24608,7 +24623,7 @@ dD
|
||||
ch
|
||||
lS
|
||||
oc
|
||||
of
|
||||
aQ
|
||||
fd
|
||||
fy
|
||||
fQ
|
||||
@@ -24626,9 +24641,9 @@ ft
|
||||
lc
|
||||
oZ
|
||||
oI
|
||||
ow
|
||||
oH
|
||||
pa
|
||||
mm
|
||||
nf
|
||||
ni
|
||||
oG
|
||||
oP
|
||||
oX
|
||||
@@ -25336,7 +25351,7 @@ iU
|
||||
jf
|
||||
jo
|
||||
ji
|
||||
hM
|
||||
mV
|
||||
hM
|
||||
ov
|
||||
op
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_x = 0;
|
||||
@@ -716,6 +717,7 @@
|
||||
/area/mothership/armory)
|
||||
"bj" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 24
|
||||
@@ -5017,6 +5019,7 @@
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_x = 0;
|
||||
@@ -6384,6 +6387,7 @@
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_x = 0;
|
||||
@@ -16842,6 +16846,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -17672,6 +17677,7 @@
|
||||
/area/mothership/warden)
|
||||
"FX" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 24
|
||||
@@ -17762,6 +17768,7 @@
|
||||
/area/mothership/engineering)
|
||||
"Gl" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -18038,6 +18045,7 @@
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -18856,6 +18864,7 @@
|
||||
/area/mothership/telecomms2)
|
||||
"IP" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 24
|
||||
@@ -18946,6 +18955,7 @@
|
||||
/area/mothership/armory)
|
||||
"IY" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -19160,6 +19170,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
cell_type = /obj/item/weapon/cell/super;
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
@@ -20237,6 +20248,7 @@
|
||||
/obj/random/mre,
|
||||
/obj/random/mre,
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -20429,6 +20441,7 @@
|
||||
/area/unknown/dorm4)
|
||||
"LY" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 24
|
||||
@@ -20695,6 +20708,7 @@
|
||||
/area/mothership/dorm6)
|
||||
"MN" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28
|
||||
@@ -21750,6 +21764,7 @@
|
||||
/area/mothership/telecomms2)
|
||||
"Pa" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -22081,6 +22096,7 @@
|
||||
/area/mothership/kitchen)
|
||||
"PH" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -22134,6 +22150,7 @@
|
||||
/area/mothership/eva)
|
||||
"PM" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -22603,6 +22620,7 @@
|
||||
/area/mothership/engineering)
|
||||
"QP" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_x = 0;
|
||||
@@ -22951,6 +22969,7 @@
|
||||
/obj/item/weapon/tank/oxygen/yellow,
|
||||
/obj/item/weapon/tank/vox,
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_x = 0;
|
||||
@@ -23619,6 +23638,7 @@
|
||||
/area/mothership/holodeck)
|
||||
"Tr" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_x = 0;
|
||||
@@ -23690,6 +23710,7 @@
|
||||
/obj/item/weapon/book/manual/security_space_law,
|
||||
/obj/structure/closet/secure_closet/nanotrasen_warden,
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
cell_type = /obj/item/weapon/cell/super;
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
@@ -23773,6 +23794,7 @@
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -23928,6 +23950,7 @@
|
||||
/area/mothership/hallway)
|
||||
"TZ" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 24
|
||||
@@ -24529,6 +24552,7 @@
|
||||
/obj/item/weapon/material/knife,
|
||||
/obj/item/weapon/material/knife,
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_x = 0;
|
||||
@@ -24892,6 +24916,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -25222,6 +25247,7 @@
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 24
|
||||
@@ -25245,6 +25271,7 @@
|
||||
/area/unknown/dorm1)
|
||||
"WP" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 24
|
||||
@@ -25555,6 +25582,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -25815,6 +25843,7 @@
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_x = 0;
|
||||
@@ -26020,6 +26049,7 @@
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -26077,6 +26107,7 @@
|
||||
/area/centcom/evac)
|
||||
"YH" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
cell_type = /obj/item/weapon/cell/super;
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
@@ -26134,6 +26165,7 @@
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 2;
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
@@ -26401,6 +26433,7 @@
|
||||
/area/mothership/eva)
|
||||
"Zt" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 24
|
||||
@@ -26556,6 +26589,7 @@
|
||||
/area/mothership/armory)
|
||||
"ZI" = (
|
||||
/obj/machinery/power/apc{
|
||||
alarms_hidden = 1;
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_x = 0;
|
||||
|
||||
Reference in New Issue
Block a user