TGS Test Merge (#6118)

Citadel-Station-13 · Nov 3, 2023 · 01a1714 · 01a1714
2 parents 2f4d5c2 + a3eaef9
commit 01a1714
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 31 deletions.
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
@@ -345,3 +345,8 @@
 
 /datum/ai_holder/simple_mob/intentional/sakimm/special_flee_check()
 	return holder.get_active_held_item()
+
+/mob/living/simple_mob/animal/sif/sakimm/dexter
+	name = "Dexter"
+	desc = "A tame, oversized rodent with hands. It seems really friendly."
+	faction = "neutral"
diff --git a/code/modules/tables/presets.dm b/code/modules/tables/presets.dm
@@ -306,6 +306,21 @@
 	material = SSmaterials.get_material(/datum/material/bone)
 	return ..()
 
+/obj/structure/table/carbon
+	icon_state = "plain_preview"
+
+/obj/structure/table/carbon/Initialize(mapload)
+	material = SSmaterials.get_material(/datum/material/carbon)
+	return ..()
+
+/obj/structure/table/carbon/reinforced
+	icon_state = "plain_preview"
+
+/obj/structure/table/carbon/reinforced/Initialize(mapload)
+	material = SSmaterials.get_material(/datum/material/carbon)
+	reinforced = SSmaterials.get_material(/datum/material/marble)
+	return ..()
+
 /*
 /obj/structure/table/bench/holotable
 	icon_state = "holo_preview"

diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm
@@ -7186,10 +7186,10 @@
 /area/maintenance/engineering/pumpstation)
 "eDQ" = (
 /obj/machinery/power/apc{
+	alarms_hidden = 1;
 	dir = 4;
 	name = "east bump";
-	pixel_x = 24;
-	alarms_hidden = 1
+	pixel_x = 24
 	},
 /obj/structure/cable/green{
 	icon_state = "0-8"
@@ -18895,10 +18895,6 @@
 /obj/machinery/computer/arcade,
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/xenobiology/outpost_breakroom)
-"mbD" = (
-/obj/random/mob/mouse,
-/turf/simulated/floor/tiled,
-/area/rnd/outpost/xenobiology/outpost_breakroom)
 "mbJ" = (
 /obj/structure/table/woodentable,
 /turf/simulated/floor/outdoors/grass/heavy/interior,
@@ -26783,8 +26779,8 @@
 "qHS" = (
 /obj/machinery/power/smes/buildable{
 	RCon_tag = "Research Southwest Wing Subgrid";
-	output_attempt = 0;
-	cur_coils = 2
+	cur_coils = 2;
+	output_attempt = 0
 	},
 /obj/structure/cable/green,
 /obj/structure/cable/green{
@@ -27489,9 +27485,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/quartermaster/office)
 "rdW" = (
-/obj/machinery/vending/cola{
-	dir = 4
-	},
+/obj/machinery/vending/cola,
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/xenobiology/outpost_breakroom)
 "rer" = (
@@ -28435,6 +28429,10 @@
 	},
 /obj/machinery/light,
 /obj/structure/cable/green,
+/obj/structure/dogbed{
+	name = "pet bed"
+	},
+/mob/living/simple_mob/animal/sif/sakimm/dexter,
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/xenobiology/outpost_breakroom)
 "rJv" = (
@@ -47420,7 +47418,7 @@ wPH
 mLf
 jPz
 pdl
-mbD
+dee
 nYD
 srP
 eZh

diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
@@ -10898,11 +10898,11 @@
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/recreation_area)
 "gZt" = (
+/obj/machinery/cryopod/robot,
 /obj/machinery/firealarm{
-	dir = 8;
+	dir = 4;
 	pixel_x = 24
 	},
-/obj/machinery/cryopod/robot,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/assembly/chargebay)
 "gZC" = (

diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm
@@ -401,9 +401,7 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/captain)
 "abq" = (
-/obj/machinery/camera/network/exploration{
-	dir = 6
-	},
+/obj/machinery/camera/network/exploration,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/courser_dock)
 "abr" = (
@@ -5230,7 +5228,7 @@
 /area/shuttle/excursion/general)
 "aoV" = (
 /obj/machinery/camera/network/exploration{
-	dir = 10
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/exploration/courser_dock)
@@ -7447,6 +7445,9 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/outline,
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration/explorer_prep)
 "auU" = (
@@ -8456,6 +8457,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -25
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration)
 "axf" = (
@@ -10216,9 +10221,7 @@
 "aCt" = (
 /obj/machinery/portable_atmospherics/canister/air,
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/camera/network/exploration{
-	dir = 6
-	},
+/obj/machinery/camera/network/exploration,
 /turf/simulated/floor/tiled/steel,
 /area/exploration/courser_dock)
 "aCu" = (
@@ -10641,6 +10644,10 @@
 /obj/effect/floor_decal/corner/beige/border{
 	dir = 10
 	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -25
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration/pathfinder_office)
 "aDL" = (
@@ -11352,6 +11359,11 @@
 /obj/effect/floor_decal/corner/beige/bordercorner2{
 	dir = 4
 	},
+/obj/machinery/firealarm{
+	dir = 4;
+	layer = 3.3;
+	pixel_x = 26
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration)
 "aFL" = (
@@ -12357,9 +12369,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/courser/cockpit)
 "aIC" = (
-/obj/machinery/vending/coffee{
-	dir = 4
-	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 9
 	},
@@ -12369,6 +12378,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals6{
 	dir = 10
 	},
+/obj/machinery/vending/coffee,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/secondary/docking_hallway)
 "aID" = (
@@ -12627,12 +12637,12 @@
 "aJm" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/beige/border,
-/obj/machinery/camera/network/exploration{
-	dir = 10
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/camera/network/exploration{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration)
 "aJn" = (
@@ -15828,6 +15838,9 @@
 /area/bridge/bridge_hallway)
 "aSj" = (
 /obj/effect/floor_decal/spline/plain,
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
 /turf/simulated/floor/wood,
 /area/exploration/meeting)
 "aSk" = (
@@ -16621,7 +16634,7 @@
 /obj/structure/table/standard{
 	name = "plastic table frame"
 	},
-/obj/item/multitool/ai_detector,
+/obj/item/multitool,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "aUr" = (
@@ -17866,6 +17879,10 @@
 /obj/effect/floor_decal/corner/beige/bordercorner2{
 	dir = 10
 	},
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -24
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration/excursion_dock)
 "aXW" = (
@@ -21485,6 +21502,13 @@
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/bar)
+"jew" = (
+/obj/structure/table/bench/standard,
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled/steel,
+/area/exploration/courser_dock)
 "jil" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
@@ -23332,6 +23356,12 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/secondary/docking_hallway2)
+"orx" = (
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/exploration/courser_dock)
 "oti" = (
 /obj/structure/bed/chair/bay/chair{
 	dir = 1
@@ -25365,6 +25395,25 @@
 /obj/effect/paint/commandblue,
 /turf/simulated/wall/r_wall/prepainted/command,
 /area/bridge)
+"uAA" = (
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 8
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9,
+/obj/effect/floor_decal/industrial/outline,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -24
+	},
+/turf/simulated/floor/tiled,
+/area/exploration/explorer_prep)
 "uCG" = (
 /obj/machinery/door/blast/shutters{
 	density = 0;
@@ -44660,7 +44709,7 @@ qnv
 pnT
 jNZ
 dIa
-asy
+uAA
 aTd
 aTd
 aTd
@@ -46031,7 +46080,7 @@ cvI
 aJN
 aVX
 cvI
-aYe
+orx
 aNv
 aHS
 aHp
@@ -46411,7 +46460,7 @@ aQr
 asV
 ahq
 hXj
-axm
+jew
 axm
 ciu
 mXd