Merge pull request #12 from Starfly-13/upstream-202502082021Z

Upstream 2025-02-08-2021Z
Starfly-13 · Feb 8, 2025 · 0960a79 · 0960a79
2 parents eafc828 + 199b937
commit 0960a79
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 5 deletions.
diff --git a/_maps/shuttles/cybersun/cybersun_nimbus.dmm b/_maps/shuttles/cybersun/cybersun_nimbus.dmm
@@ -2197,6 +2197,15 @@
 	pixel_y = 6
 	},
 /obj/item/soap/deluxe,
+/obj/machinery/button/door{
+	pixel_y = -20;
+	pixel_x = 22;
+	dir = 1;
+	name = "door lock";
+	normaldoorcontrol = 1;
+	specialfunctions = 4;
+	id = "nimbbath"
+	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/cargo)
 "NU" = (
@@ -2460,7 +2469,8 @@
 /area/ship/crew/ccommons)
 "SN" = (
 /obj/machinery/door/airlock/hatch{
-	name = "Restroom"
+	name = "Restroom";
+	id_tag = "nimbbath"
 	},
 /obj/effect/turf_decal/spline/fancy/opaque/white,
 /turf/open/floor/plasteel/tech,

diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
@@ -349,5 +349,6 @@ GLOBAL_LIST_INIT(dye_registry, list(
 
 /obj/machinery/washing_machine/open_machine(drop = 1)
 	..()
-	density = TRUE //because machinery/open_machine() sets it to 0
+	if(initial(density))
+		density = TRUE //because machinery/open_machine() sets it to 0
 	color_source = null
diff --git a/code/game/objects/items/bodycamera.dm b/code/game/objects/items/bodycamera.dm
@@ -39,7 +39,7 @@
 	if(in_range(src, user))
 		. += "<span class='notice'>The body camera is set to a nametag of '<b>[c_tag]</b>'.</span>"
 		. += "<span class='notice'>The body camera is set to transmit on the '<b>[network[1]]</b>' network.</span>"
-		. += "<span class='notice'>It looks like you can modify the camera settings by using a <b>multitool<b> on it.</span>"
+		. += "<span class='notice'>It looks like you can modify the camera settings by using a <b>multitool</b> on it.</span>"
 
 /obj/item/bodycamera/AltClick(mob/user)
 	. = ..()

diff --git a/code/modules/cargo/packs/mechs.dm b/code/modules/cargo/packs/mechs.dm
@@ -53,6 +53,8 @@ Build Your Own Suit
 		/obj/item/circuitboard/mecha/odysseus/main
 		)
 	crate_name = "202r Construction Kit"
+	faction = /datum/faction/syndicate/cybersun
+	faction_discount = 40
 
 /datum/supply_pack/mech/gygax_parts
 	name = "501p construction kit"
@@ -72,6 +74,8 @@ Build Your Own Suit
 		/obj/item/circuitboard/mecha/gygax/targeting
 	)
 	crate_name = "501p Construction Kit"
+	faction = /datum/faction/syndicate/cybersun
+	faction_discount = 40
 
 /datum/supply_pack/mech/mpgygax_parts
 	name = "NT-501p-MP construction kit"
@@ -112,6 +116,8 @@ Build Your Own Suit
 		/obj/item/circuitboard/mecha/durand/targeting
 	)
 	crate_name = "Durand Construction Kit"
+	faction = /datum/faction/clip
+	faction_discount = 20
 
 /*
 Mech Equipment

diff --git a/code/modules/cargo/packs/weapon_attachments.dm b/code/modules/cargo/packs/weapon_attachments.dm
@@ -59,7 +59,7 @@
 	contains = list(/obj/item/attachment/scope)
 	crate_name = "scope crate"
 
-/datum/supply_pack/attachment/rail_light
+/datum/supply_pack/attachment/long_scope
 	name = "Long Scope Crate"
 	desc = "Contains a single high powered scope to be mounted on a firearm."
 	cost = 800

diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm
@@ -173,7 +173,11 @@
 
 	var/list/visible_turfs = list()
 
-	if(!active_camera.loc)
+	if(!active_camera)
+		show_camera_static()
+		return
+	else if (active_camera.loc == null)
+		show_camera_static()
 		return
 
 	var/cam_location = active_camera.loc

diff --git a/html/changelogs/AutoChangeLog-pr-4103.yml b/html/changelogs/AutoChangeLog-pr-4103.yml
@@ -0,0 +1,5 @@
+author: zimon9
+changes:
+  - {bugfix: fixed securEye runtime}
+  - {bugfix: fixed bodycamera description typo}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-4135.yml b/html/changelogs/AutoChangeLog-pr-4135.yml
@@ -0,0 +1,5 @@
+author: Erikafox
+changes:
+  - {rscadd: nimbus bathroom lock}
+  - {bugfix: some washing machines no longer magically become dense}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-4139.yml b/html/changelogs/AutoChangeLog-pr-4139.yml
@@ -0,0 +1,5 @@
+author: Erikafox
+changes:
+  - {balance: cybersun now gets discounts on cybersun mech designs. clip gets a discount
+      on the Durand for the same reason}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-4152.yml b/html/changelogs/AutoChangeLog-pr-4152.yml
@@ -0,0 +1,4 @@
+author: SomeguyManperson
+changes:
+  - {bugfix: rail light is back}
+delete-after: true