Horizon Bugfixes 01 (#13449)

code/modules/overmap/ships/computers/sensors.dm

@@ -75,7 +75,7 @@
 		return TOPIC_NOACTION
 
 	if (href_list["viewing"])
-		if(usr && !isAI(usr))
+		if(usr)
 			viewing_overmap(usr) ? unlook(usr) : look(usr)
 		return TOPIC_REFRESH
 
@@ -86,7 +86,7 @@
 	if(sensors)
 		if (href_list["range"])
 			var/nrange = input("Set new sensors range", "Sensor range", sensors.range) as num|null
-			if(!CanInteract(usr, physical_state))
+			if(!CanInteract(usr, default_state))
 				return TOPIC_NOACTION
 			if (nrange)
 				sensors.set_range(Clamp(nrange, 1, world.view))

code/modules/overmap/ships/computers/ship.dm

@@ -45,15 +45,30 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
 	if(user.client)
 		user.client.view = world.view + extra_view
 	moved_event.register(user, src, /obj/machinery/computer/ship/proc/unlook)
+	if(user.eyeobj)
+		moved_event.register(user.eyeobj, src, /obj/machinery/computer/ship/proc/unlook)
 	LAZYDISTINCTADD(viewers, WEAKREF(user))
 
 /obj/machinery/computer/ship/proc/unlook(var/mob/user)
 	user.reset_view()
-	if(user.client)
-		user.client.view = world.view
-		user.client.pixel_x = 0
-		user.client.pixel_y = 0
+	var/client/c = user.client
+
+	if(isEye(user))
+		var/mob/abstract/eye/E = user
+		E.reset_view()
+		c = E.owner.client
+
+	if(c)
+		c.view = world.view
+		c.pixel_x = 0
+		c.pixel_y = 0
+
 	moved_event.unregister(user, src, /obj/machinery/computer/ship/proc/unlook)
+
+	if(isEye(user)) // If we're an AI eye, the computer has our AI mob in its viewers list not the eye mob
+		var/mob/abstract/eye/E = user
+		moved_event.unregister(E.owner, src, /obj/machinery/computer/ship/proc/unlook)
+		LAZYREMOVE(viewers, WEAKREF(E.owner))
 	LAZYREMOVE(viewers, WEAKREF(user))
 
 /obj/machinery/computer/ship/proc/viewing_overmap(mob/user)
@@ -72,7 +87,8 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
 	if(!viewing_overmap(user))
 		return FALSE
 
-	if (use_check_and_message(user) || user.blinded || inoperable() || !linked)
+	var/flags = issilicon(user) ? USE_ALLOW_NON_ADJACENT : 0
+	if (use_check_and_message(user, flags) || user.blinded || inoperable() || !linked)
 		return -1
 	else
 		return 0

html/changelogs/horizon-fixes-01.yml

@@ -0,0 +1,10 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes:
+    - bugfix: "AI can now use the sensors console fully."
+    - bugfix: "Operations mailing room no longer launches the rubbish off of the conveyor belt."
+    - bugfix: "Port Propulsion now has an additional valve to toggle that will send cold phoron to the starboard thruster if you wish to operate with cold propellant. Note that this mode will result in less thrust and it is preferable to use the burn chambers!"
+    - tweak: "D1 Operations areas now have some additional holopads."
+    - tweak: "CE and Journalist Officers are now better lit."

maps/sccv_horizon/sccv_horizon-1_deck_1.dmm

@@ -2173,6 +2173,19 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
 /area/hangar/operations)
+"bSO" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/dark,
+/area/operations/lower/machinist)
 "bUN" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -3289,12 +3302,16 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/eva)
 "cWX" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 6
 	},
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 1
+	},
+/obj/machinery/atmospherics/tvalve/digital/bypass{
+	dir = 1;
+	name = "Starboard Thruster Propellant Input Switch"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/propulsion)
 "cYs" = (
@@ -4296,6 +4313,7 @@
 /obj/effect/floor_decal/corner/white{
 	dir = 10
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/white,
 /area/operations/lower/machinist)
 "eaO" = (
@@ -5156,6 +5174,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/purple{
 	dir = 4
 	},
+/obj/machinery/meter,
 /turf/simulated/floor/plating,
 /area/engineering/atmos/propulsion)
 "eKi" = (
@@ -5947,9 +5966,6 @@
 /obj/machinery/atmospherics/tvalve/digital{
 	dir = 4
 	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/propulsion)
 "fnL" = (
@@ -6438,12 +6454,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/hangar/starboard)
 "fKe" = (
-/obj/machinery/meter,
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/pipe/simple/hidden/purple{
-	dir = 4
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
 	},
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/pipe/manifold/visible/purple{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/propulsion)
 "fKk" = (
 /obj/structure/table/steel,
@@ -7160,9 +7177,6 @@
 /turf/simulated/floor/plating,
 /area/hangar/control)
 "gnP" = (
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 1
-	},
 /obj/machinery/atmospherics/binary/pump/high_power{
 	layer = 2.8
 	},
@@ -22686,6 +22700,22 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/storage/lower)
+"uBi" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled,
+/area/outpost/mining_main/refinery)
 "uCq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -42557,7 +42587,7 @@ pWZ
 cWd
 hhO
 tgR
-beP
+uBi
 tgR
 xwo
 eqk
@@ -45568,7 +45598,7 @@ sLn
 qIT
 iDw
 hYh
-wqs
+bSO
 fga
 wMO
 pYD

maps/sccv_horizon/sccv_horizon-2_deck_2.dmm

@@ -1141,6 +1141,7 @@
 	layer = 2.9;
 	reversed = 1
 	},
+/obj/structure/plasticflaps,
 /turf/simulated/floor/plating,
 /area/operations/mail_room)
 "aHj" = (
@@ -9842,6 +9843,9 @@
 	},
 /obj/effect/decal/warning_stripes,
 /mob/living/simple_animal/carp/fluff/ginny,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/reinforced,
 /area/crew_quarters/heads/chief)
 "ghX" = (
@@ -19883,6 +19887,7 @@
 /obj/item/modular_computer/console/preset/engineering/ce{
 	dir = 1
 	},
+/obj/machinery/light,
 /turf/simulated/floor/carpet/rubber,
 /area/crew_quarters/heads/chief)
 "mxO" = (
@@ -27328,12 +27333,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/brig)
-"rel" = (
-/obj/structure/disposalpipe/trunk,
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/structure/disposaloutlet,
-/turf/simulated/floor/plating,
-/area/operations/mail_room)
 "reo" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -28986,6 +28985,13 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/plasticflaps,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/operations/mail_room)
 "rXJ" = (
@@ -31883,19 +31889,21 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_waste)
 "tQk" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/industrial/warning/corner{
+/obj/structure/disposaloutlet{
+	dir = 8
+	},
+/obj/structure/disposalpipe/trunk,
+/obj/structure/window/reinforced{
+	layer = 5;
+	name = "adjusted reinforced window"
+	},
+/obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/effect/floor_decal/industrial/warning{
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/machinery/conveyor{
-	dir = 5;
-	id = "sorting";
-	layer = 2.9;
-	reversed = null
-	},
 /turf/simulated/floor/plating,
 /area/operations/mail_room)
 "tQB" = (
@@ -53951,7 +53959,7 @@ bOV
 kUc
 nkK
 nIi
-rel
+iuP
 tQk
 eew
 pPO

maps/sccv_horizon/sccv_horizon-3_deck_3.dmm

@@ -12446,6 +12446,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/vacantoffice2)
+"DZ" = (
+/obj/effect/floor_decal/corner/paleblue/full{
+	dir = 4
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled/dark,
+/area/hallway/primary/starboard)
 "Ea" = (
 /obj/machinery/door/airlock/hatch{
 	desc = "It opens and closes. It has a small sign engraved: Bunker capacity: 6. Only facility's Command Staff is permitted.";
@@ -16266,9 +16273,6 @@
 /area/security/vacantoffice2)
 "Nj" = (
 /obj/structure/flora/pottedplant/random,
-/obj/machinery/light{
-	dir = 8
-	},
 /turf/simulated/floor/wood,
 /area/journalistoffice)
 "Nl" = (
@@ -16606,6 +16610,7 @@
 	name = "corkboard";
 	pixel_y = -26
 	},
+/obj/machinery/light,
 /turf/simulated/floor/carpet,
 /area/journalistoffice)
 "NV" = (
@@ -44916,7 +44921,7 @@ Od
 Tu
 Fz
 RJ
-BW
+DZ
 vx
 Oa
 Mt