TGS Test Merge (#6118)

Citadel-Station-13 · Nov 3, 2023 · 0ba6f9c · 0ba6f9c
2 parents a2537c7 + 3a26306
commit 0ba6f9c
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 21 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 = "station"
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
@@ -289,6 +289,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/bed/chair/sofa/black/right{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "ang" = (
@@ -4815,6 +4818,18 @@
 "ddZ" = (
 /turf/simulated/floor/outdoors/gravsnow/lythios43c/indoors,
 /area/rift/surfacebase/outside/outside2)
+"dek" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/lightgrey/border{
+	dir = 8
+	},
+/obj/structure/bed/chair/sofa/black/right{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
 "dep" = (
 /turf/simulated/wall/prepainted/security,
 /area/security/range)
@@ -10898,11 +10913,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" = (
@@ -12054,6 +12069,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 8
 	},
+/obj/structure/bed/chair/sofa/black/corner,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "hMP" = (
@@ -14489,6 +14505,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 4
 	},
+/obj/structure/bed/chair/sofa/black/right,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "jmn" = (
@@ -14658,6 +14675,9 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 4
 	},
+/obj/structure/bed/chair/sofa/black/corner{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "jrD" = (
@@ -20437,6 +20457,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
+/obj/structure/bed/chair/sofa/black/left{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "mMZ" = (
@@ -27283,6 +27306,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/bed/chair/sofa/black/left{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "rib" = (
@@ -28235,6 +28261,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/structure/bed/chair/sofa/black/right{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "rMB" = (
@@ -28814,6 +28843,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 8
 	},
+/obj/structure/bed/chair/sofa/black/left,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "sfC" = (
@@ -30139,6 +30169,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/table/carbon/reinforced,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "teZ" = (
@@ -31854,6 +31885,7 @@
 /obj/effect/floor_decal/corner/purple/bordercorner2{
 	dir = 9
 	},
+/obj/machinery/media/jukebox,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "unz" = (
@@ -33062,6 +33094,7 @@
 	},
 /obj/effect/floor_decal/borderfloor/corner2,
 /obj/effect/floor_decal/corner/purple/bordercorner2,
+/obj/structure/table/carbon/reinforced,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "uZq" = (
@@ -34584,6 +34617,10 @@
 /obj/effect/overlay/snow/floor,
 /turf/simulated/floor/plating,
 /area/rift/surfacebase/outside/outside2)
+"weh" = (
+/obj/structure/table/carbon/reinforced,
+/turf/simulated/floor/glass/reinforced,
+/area/hallway/primary/surfacetwo)
 "wek" = (
 /obj/structure/closet/secure_closet/personal,
 /turf/simulated/floor/wood,
@@ -36223,6 +36260,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/table/carbon/reinforced,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "xpI" = (
@@ -36326,6 +36364,18 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/sleep)
+"xqT" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lightgrey/border{
+	dir = 4
+	},
+/obj/structure/bed/chair/sofa/black/left{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
 "xrI" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -53037,7 +53087,7 @@ xUe
 xUe
 emT
 jru
-xLE
+dek
 mDz
 bgP
 bgP
@@ -53231,7 +53281,7 @@ rCo
 rCo
 xUe
 sfB
-bgP
+weh
 bgP
 bgP
 bgP
@@ -53619,7 +53669,7 @@ rCo
 rCo
 xUe
 jmj
-bgP
+weh
 bgP
 bgP
 bgP
@@ -53813,7 +53863,7 @@ xUe
 xUe
 emT
 hLX
-sJl
+xqT
 iru
 bgP
 bgP

diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm
@@ -12357,9 +12357,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 +12366,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" = (