mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
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:
@@ -17216,6 +17216,9 @@
|
|||||||
d2 = 8;
|
d2 = 8;
|
||||||
icon_state = "4-8"
|
icon_state = "4-8"
|
||||||
},
|
},
|
||||||
|
/obj/structure/cable{
|
||||||
|
icon_state = "2-4"
|
||||||
|
},
|
||||||
/turf/simulated/floor/tiled,
|
/turf/simulated/floor/tiled,
|
||||||
/area/hallway/station/upper)
|
/area/hallway/station/upper)
|
||||||
"Bm" = (
|
"Bm" = (
|
||||||
@@ -27411,6 +27414,23 @@
|
|||||||
/obj/machinery/hologram/holopad,
|
/obj/machinery/hologram/holopad,
|
||||||
/turf/simulated/floor/carpet,
|
/turf/simulated/floor/carpet,
|
||||||
/area/security/breakroom)
|
/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" = (
|
"Up" = (
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
@@ -33396,7 +33416,7 @@ yk
|
|||||||
wf
|
wf
|
||||||
Aa
|
Aa
|
||||||
Bl
|
Bl
|
||||||
Ca
|
Uo
|
||||||
Da
|
Da
|
||||||
DF
|
DF
|
||||||
EB
|
EB
|
||||||
|
|||||||
@@ -2636,6 +2636,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"
|
||||||
|
|||||||
Reference in New Issue
Block a user