cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4585 from Novacat/nova-survival

Browse Source 
Fixes major merge errors
This commit is contained in:
Spades
2018-12-13 19:47:31 -05:00
committed by GitHub
parent 99cc046512 5eac21477d
commit e1de74a24e
4 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
code/modules/reagents/reagent_containers/glass/bottle_vr.dm → code/modules/food/glass/bottle_vr.dm
View File

0
code/game/machinery/kitchen/smartfridge_vr.dm → code/modules/food/kitchen/smartfridge_vr.dm
View File

61
maps/tether/tether-07-station3.dmm
View File

@@ -15395,6 +15395,16 @@
/obj/effect/floor_decal/steeldecal/steel_decals6{ /obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 10 dir = 10
}, },
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
pixel_x = 0;
pixel_y = 28
},
/obj/structure/cable{
d2 = 2;
icon_state = "0-2"
},
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/hallway/station/upper) /area/hallway/station/upper)
"yF" = ( "yF" = (
@@ -16035,6 +16045,12 @@
/obj/effect/floor_decal/corner/lightgrey{ /obj/effect/floor_decal/corner/lightgrey{
dir = 9 dir = 9
}, },
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/hallway/station/upper) /area/hallway/station/upper)
"zz" = ( "zz" = (
@@ -27351,6 +27367,25 @@
/obj/machinery/meter, /obj/machinery/meter,
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/security/eva) /area/security/eva)
"Rn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"Rs" = ( "Rs" = (
/obj/machinery/button/windowtint{ /obj/machinery/button/windowtint{
id = "sec_processing"; id = "sec_processing";
@@ -27495,6 +27530,28 @@
}, },
/turf/simulated/floor/bluegrid, /turf/simulated/floor/bluegrid,
/area/ai/foyer) /area/ai/foyer)
"XT" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"ZO" = ( "ZO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
@@ -36944,8 +37001,8 @@ tn
sp sp
yE yE
zy zy
As XT
Bz Rn
Cn Cn
Dr Dr
DZ DZ

3
vorestation.dme
View File

@@ -1775,11 +1775,13 @@
#include "code\modules\food\food\drinks\bottle\robot.dm" #include "code\modules\food\food\drinks\bottle\robot.dm"
#include "code\modules\food\food\snacks\meat.dm" #include "code\modules\food\food\snacks\meat.dm"
#include "code\modules\food\glass\bottle.dm" #include "code\modules\food\glass\bottle.dm"
#include "code\modules\food\glass\bottle_vr.dm"
#include "code\modules\food\glass\bottle\robot.dm" #include "code\modules\food\glass\bottle\robot.dm"
#include "code\modules\food\kitchen\gibber.dm" #include "code\modules\food\kitchen\gibber.dm"
#include "code\modules\food\kitchen\icecream.dm" #include "code\modules\food\kitchen\icecream.dm"
#include "code\modules\food\kitchen\microwave.dm" #include "code\modules\food\kitchen\microwave.dm"
#include "code\modules\food\kitchen\smartfridge.dm" #include "code\modules\food\kitchen\smartfridge.dm"
#include "code\modules\food\kitchen\smartfridge_vr.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm"
#include "code\modules\food\kitchen\cooking_machines\candy.dm" #include "code\modules\food\kitchen\cooking_machines\candy.dm"
@@ -2636,6 +2638,7 @@
#include "code\modules\reagents\reagent_containers\spray.dm" #include "code\modules\reagents\reagent_containers\spray.dm"
#include "code\modules\reagents\reagent_containers\spray_vr.dm" #include "code\modules\reagents\reagent_containers\spray_vr.dm"
#include "code\modules\reagents\reagent_containers\syringes.dm" #include "code\modules\reagents\reagent_containers\syringes.dm"
#include "code\modules\reagents\reagent_containers\syringes_vr.dm"
#include "code\modules\recycling\conveyor2.dm" #include "code\modules\recycling\conveyor2.dm"
#include "code\modules\recycling\disposal-construction.dm" #include "code\modules\recycling\disposal-construction.dm"
#include "code\modules\recycling\disposal.dm" #include "code\modules\recycling\disposal.dm"