Fixes major merge errors

- Readds missing APC to the third floor station
- Readds missing syringes.dm to the dme file

Considering the nature of these errors, there may be more merge errors hidden.
This commit is contained in:
Unknown
2018-12-13 00:05:18 -05:00
parent 99cc046512
commit a7f5702981
2 changed files with 22 additions and 1 deletions

View File

@@ -17216,6 +17216,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"Bm" = (
@@ -27411,6 +27414,23 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet,
/area/security/breakroom)
"Uo" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 8
},
/obj/machinery/power/apc{
dir = 2;
name = "south bump";
pixel_y = -28
},
/obj/structure/cable,
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"Up" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/regular{
@@ -33396,7 +33416,7 @@ yk
wf
Aa
Bl
Ca
Uo
Da
DF
EB

View File

@@ -2636,6 +2636,7 @@
#include "code\modules\reagents\reagent_containers\spray.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_vr.dm"
#include "code\modules\recycling\conveyor2.dm"
#include "code\modules\recycling\disposal-construction.dm"
#include "code\modules\recycling\disposal.dm"