Merge branch 'master220' into nucleation_resprite

ss220-space · Dec 7, 2024 · 5366703 · 5366703
2 parents d56c123 + f865651
commit 5366703
Show file tree

Hide file tree

Showing 28 changed files with 1,997 additions and 784 deletions.
diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm
@@ -8047,6 +8047,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue"
 	},
@@ -21376,6 +21379,10 @@
 	icon_state = "purplefull"
 	},
 /area/medical/research/nhallway)
+"dcl" = (
+/obj/effect/spawner/random_spawners/blood_5,
+/turf/simulated/floor/plating,
+/area/maintenance/secpost)
 "dcq" = (
 /turf/simulated/wall/r_wall,
 /area/toxins/xenobiology)
@@ -30040,6 +30047,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -36205,7 +36213,10 @@
 /area/turret_protected/aisat_interior/secondary)
 "fkL" = (
 /obj/machinery/vending/boozeomat,
-/turf/simulated/floor/carpet/black,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood/dark,
 /area/ntrep)
 "fkO" = (
 /obj/structure/railing/corner{
@@ -38557,6 +38568,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/storage/secure)
+"fBy" = (
+/obj/effect/decal/cleanable/spiderling_remains,
+/turf/simulated/floor/plating,
+/area/maintenance/secpost)
 "fBE" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -40551,6 +40566,11 @@
 	},
 /turf/simulated/floor/carpet/red,
 /area/lawoffice)
+"fQX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/vomit,
+/turf/simulated/floor/plating,
+/area/maintenance/secpost)
 "fQY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/ammo_casing{
@@ -49004,6 +49024,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = -30
+	},
 /turf/simulated/floor/engine{
 	slowdown = -0.3
 	},
@@ -58387,6 +58410,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -67059,6 +67085,9 @@
 	pixel_y = -33;
 	req_access = list(73)
 	},
+/obj/structure/disposalpipe/trunk/multiz/down{
+	dir = 2
+	},
 /turf/simulated/floor/carpet/black,
 /area/ntrep)
 "jOs" = (
@@ -73290,6 +73319,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -76649,6 +76679,9 @@
 /area/maintenance/fsmaint)
 "loQ" = (
 /obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
 /turf/simulated/floor/carpet/black,
 /area/ntrep)
 "loR" = (
@@ -77678,6 +77711,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/trunk/multiz{
+	dir = 2
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "dark"
@@ -77889,6 +77925,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -83543,12 +83580,6 @@
 /turf/space/openspace,
 /area/space)
 "mpH" = (
-/obj/structure/disposalpipe/sortjunction{
-	dir = 1;
-	name = "Captain's Office";
-	sortType = 18;
-	icon_state = "pipe-j2s"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -83565,6 +83596,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/disposalpipe/sortjunction/reversed{
+	dir = 1;
+	name = "Captain Office";
+	sortType = 18
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -86599,6 +86635,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -90705,6 +90742,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "dark"
@@ -92138,8 +92176,8 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 6
+/obj/structure/disposalpipe/junction/reversed{
+	dir = 2
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -147670,6 +147708,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = -30
+	},
 /turf/simulated/floor/engine{
 	slowdown = -0.3
 	},
@@ -148865,6 +148906,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -157988,6 +158030,11 @@
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/crew_quarters/theatre)
+"xhp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/blood_5,
+/turf/simulated/floor/plating,
+/area/maintenance/secpost)
 "xhr" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -255171,7 +255218,7 @@ ieI
 gtF
 otn
 kZy
-wUw
+fQX
 chE
 ddQ
 bbZ
@@ -255685,7 +255732,7 @@ orm
 kfz
 xKb
 thB
-wre
+dcl
 xic
 ddQ
 oqM
@@ -256711,7 +256758,7 @@ btM
 syu
 gVD
 bbZ
-wre
+fBy
 mVH
 bRV
 wre
@@ -257228,7 +257275,7 @@ awC
 xRZ
 pWi
 wUw
-wre
+fBy
 ihn
 xXG
 aiQ
@@ -257486,7 +257533,7 @@ xRZ
 wre
 wCs
 rhi
-wUw
+xhp
 uhC
 cPv
 tUk
@@ -258000,7 +258047,7 @@ hoH
 mTa
 mqL
 jYH
-wre
+fBy
 awC
 ibR
 jAH

diff --git a/code/controllers/subsystem/idlenpcpool.dm b/code/controllers/subsystem/idlenpcpool.dm
@@ -33,9 +33,8 @@ SUBSYSTEM_DEF(idlenpcpool)
 
 
 /datum/controller/subsystem/idlenpcpool/fire(resumed = FALSE)
-	if(!resumed)
-		var/list/idlelist = GLOB.simple_animals[AI_IDLE]
-		src.currentrun = idlelist.Copy()
+	var/list/idlelist = GLOB.simple_animals[AI_IDLE]
+	src.currentrun = idlelist.Copy()
 
 	//cache for sanic speed (lists are references anyways)
 	var/list/currentrun = src.currentrun

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
@@ -1618,7 +1618,7 @@
 	name = "Access Tuner"
 	desc = "The access tuner is a small device that can interface with airlocks from range. It takes a few seconds to connect and can change the bolt state, open the door, or toggle emergency access."
 	item = /obj/item/door_remote/omni/access_tuner
-	cost = 30
+	cost = 15
 
 /datum/uplink_item/device_tools/toolbox
 	name = "Fully Loaded Toolbox"

diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
@@ -68,6 +68,9 @@
 		// Open UI
 		ui = new(user, src, "CameraConsole", name)
 		ui.open()
+		sleep(1)	//Fast and furious: assets were too slow and camera got screwed!
+		if(!ui.closing)
+			ui.window?.reinitialize()
 
 /obj/machinery/computer/security/ui_assets(mob/user)
 	return list(