Merge remote-tracking branch 'upstream/master'

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -5990,6 +5990,19 @@
 	dir = 5
 	},
 /area/station/maintenance/port/aft)
+"bLa" = (
+/obj/structure/bed,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/spawner/random/bedsheet,
+/obj/machinery/button/door/directional/east{
+	id = "Dorm1";
+	name = "Dorm Bolt Control";
+	normaldoorcontrol = 1;
+	specialfunctions = 4
+	},
+/obj/item/pillow/random,
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
 "bLc" = (
 /turf/open/floor/iron/dark/textured_edge{
 	dir = 1
@@ -49673,7 +49686,7 @@
 /area/station/hallway/primary/central)
 "oTh" = (
 /obj/machinery/door/airlock{
-	id_tag = "Dorm2";
+	id_tag = "Dorm1";
 	name = "Dorm 1"
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -242567,7 +242580,7 @@ ygB
 mJO
 oCF
 ygB
-mJO
+bLa
 oCF
 ygB
 lBD

_maps/map_files/NorthStar/north_star.dmm

@@ -8859,7 +8859,8 @@
 	},
 /area/station/command/teleporter)
 "cix" = (
-/obj/machinery/restaurant_portal/restaurant,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/station/service/kitchen/diner)
 "ciz" = (
@@ -56091,11 +56092,9 @@
 /turf/open/floor/plating,
 /area/station/maintenance/floor4/starboard)
 "osX" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/structure/hedge,
-/turf/open/floor/carpet/green,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/restaurant_portal/bar,
+/turf/open/floor/wood,
 /area/station/service/kitchen/diner)
 "ote" = (
 /obj/effect/spawner/structure/window/reinforced,
@@ -62361,6 +62360,7 @@
 /area/station/science/auxlab)
 "qaY" = (
 /obj/effect/spawner/random/engineering/tracking_beacon,
+/obj/structure/cable,
 /turf/open/floor/wood,
 /area/station/service/kitchen/diner)
 "qbh" = (
@@ -81796,9 +81796,9 @@
 /turf/open/floor/pod/light,
 /area/station/maintenance/floor4/port/fore)
 "ved" = (
-/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/wood,
 /area/station/service/kitchen/diner)
 "veA" = (
@@ -91648,6 +91648,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
 	},
+/obj/structure/cable,
 /turf/open/floor/wood,
 /area/station/service/kitchen/diner)
 "xCR" = (
@@ -247096,11 +247097,11 @@ fjo
 mso
 dFd
 awt
-cix
 gjf
 gjf
-qoa
 gjf
+qoa
+jDe
 jDe
 qoW
 tTc
@@ -247354,7 +247355,6 @@ mso
 dFd
 awt
 gjf
-gjf
 ulB
 ulB
 ulB
@@ -247363,6 +247363,7 @@ bMs
 kpa
 jzE
 gjf
+gjf
 ddx
 rBC
 rBC
@@ -247611,7 +247612,6 @@ mso
 laJ
 jWT
 tRT
-gjf
 nXq
 xEL
 oAm
@@ -247620,6 +247620,7 @@ dId
 jAl
 jHT
 gjf
+gjf
 ddx
 rBC
 rBC
@@ -247868,7 +247869,6 @@ gWg
 iOh
 awt
 gjf
-gjf
 mQg
 rBC
 pzK
@@ -247877,6 +247877,7 @@ gjf
 wtg
 gjf
 gjf
+gjf
 uCW
 kHc
 xAq
@@ -248125,7 +248126,6 @@ qcd
 ccF
 awt
 gjf
-xCM
 mQg
 rBC
 pzK
@@ -248134,6 +248134,7 @@ gjf
 vXY
 vRj
 ldV
+osX
 jHJ
 hVt
 hVt
@@ -248382,14 +248383,14 @@ qcd
 nsn
 rSS
 xDS
-xDS
 sln
 jAl
 pWr
 jDe
 bMs
 kpa
 jzE
+gjf
 vRj
 vWQ
 vWQ
@@ -248638,17 +248639,17 @@ fjo
 qcd
 ceh
 dMj
-gjf
-xDS
+cix
 ulB
 ulB
 ulB
-jDe
+xCM
 dId
 jAl
 jHT
+gjf
+xDS
 xDS
-xna
 xna
 xna
 xna
@@ -248895,17 +248896,17 @@ fjo
 qcd
 fOu
 awt
-gjf
-xDS
-xDS
+cix
+cix
 xDS
 xDS
 ved
 xDS
 xDS
 xDS
 xDS
-osX
+xDS
+gjf
 vZg
 dIx
 dIx
@@ -249154,10 +249155,10 @@ dFd
 awt
 gjf
 gjf
-gjf
+vXY
 xDS
 qaY
-jDe
+gjf
 gjf
 wtg
 gjf
@@ -249413,11 +249414,11 @@ rZS
 nla
 mQF
 xDS
-gjf
 jDe
 bMs
 kpa
 jzE
+gjf
 tFS
 nNJ
 ycW
@@ -249670,12 +249671,12 @@ ubR
 mhE
 rwh
 xDS
-gjf
 jDe
 dId
 jAl
 jHT
 gjf
+gjf
 nNJ
 dxv
 ssj
@@ -249928,7 +249929,7 @@ ubR
 nYE
 xDS
 jDe
-jDe
+gjf
 iwU
 psq
 eEr

code/__DEFINES/dcs/signals/signals_storage.dm

@@ -5,5 +5,14 @@
 /// Sent after dumping into some other storage object: (atom/dest_object, mob/user)
 #define COMSIG_STORAGE_DUMP_POST_TRANSFER "storage_dump_into_storage"
 
-/// Sent to the STORAGE when an ITEM is STORED INSIDE.
+/// Fired off the storage's PARENT when an ITEM is STORED INSIDE. (obj/item, mob, force)
+#define COMSIG_ATOM_STORED_ITEM "atom_storing_item"
+
+/// Fired off the storage's PARENT when an ITEM is REMOVED. (obj/item, atom, silent)
+#define COMSIG_ATOM_REMOVED_ITEM "atom_removing_item"
+
+/// Sent to the STORAGE when an ITEM is STORED INSIDE. (obj/item, mob, force)
 #define COMSIG_STORAGE_STORED_ITEM "storage_storing_item"
+
+/// Sent to the STORAGE when an ITEM is REMOVED. (obj/item, atom, silent)
+#define COMSIG_STORAGE_REMOVED_ITEM "storage_removing_item"

code/_onclick/click_alt.dm

@@ -11,7 +11,10 @@
 		return
 
 	// Is it visible (and we're not wearing it (our clothes are invisible))?
-	if(!(src in viewers(7, target)) && !CanReach(target))
+	if(!CAN_I_SEE(target))
+		return
+
+	if(is_blind() && !IN_GIVEN_RANGE(src, target, 1))
 		return
 
 	var/turf/tile = get_turf(target)

code/_onclick/hud/robot.dm

@@ -197,39 +197,7 @@
 	if(!R.client)
 		return
 
-	if(R.shown_robot_modules && screenmob.hud_used.hud_shown)
-		//Modules display is shown
-		screenmob.client.screen += module_store_icon //"store" icon
-
-		if(!R.model.modules)
-			to_chat(usr, span_warning("Selected model has no modules to select!"))
-			return
-
-		if(!R.robot_modules_background)
-			return
-
-		var/display_rows = max(CEILING(length(R.model.get_inactive_modules()) / 8, 1),1)
-		R.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7"
-		screenmob.client.screen += R.robot_modules_background
-
-		var/x = -4 //Start at CENTER-4,SOUTH+1
-		var/y = 1
-
-		for(var/atom/movable/A in R.model.get_inactive_modules())
-			//Module is not currently active
-			screenmob.client.screen += A
-			if(x < 0)
-				A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7"
-			else
-				A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7"
-			SET_PLANE_IMPLICIT(A, ABOVE_HUD_PLANE)
-
-			x++
-			if(x == 4)
-				x = -4
-				y++
-
-	else
+	if(!R.shown_robot_modules || !screenmob.hud_used.hud_shown)
 		//Modules display is hidden
 		screenmob.client.screen -= module_store_icon //"store" icon
 
@@ -238,6 +206,41 @@
 			screenmob.client.screen -= A
 		R.shown_robot_modules = 0
 		screenmob.client.screen -= R.robot_modules_background
+		return
+
+	//Modules display is shown
+	screenmob.client.screen += module_store_icon //"store" icon
+
+	if(!R.model.modules)
+		to_chat(usr, span_warning("Selected model has no modules to select!"))
+		return
+
+	if(!R.robot_modules_background)
+		return
+
+	var/list/usable_modules = R.model.get_usable_modules()
+
+	var/display_rows = max(CEILING(length(usable_modules) / 8, 1),1)
+	R.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7"
+	screenmob.client.screen += R.robot_modules_background
+
+	for(var/i in 1 to length(usable_modules))
+		var/atom/movable/A = usable_modules[i]
+		if(A in R.held_items)
+			//Module is currently active
+			continue
+
+		// Arrange in a grid x=-4 to 3 and y=1 to display_rows
+		var/x = (i - 1) % 8 - 4
+		var/y = floor((i - 1) / 8) + 1
+
+		screenmob.client.screen += A
+		if(x < 0)
+			A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7"
+		else
+			A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7"
+		SET_PLANE_IMPLICIT(A, ABOVE_HUD_PLANE)
+
 
 /datum/hud/robot/persistent_inventory_update(mob/viewer)
 	if(!mymob)

code/datums/ai/basic_mobs/basic_subtrees/express_happiness.dm

@@ -7,7 +7,7 @@
 	var/happiness_key = BB_BASIC_HAPPINESS
 	///list of emotions we relay when happy
 	var/static/list/happy_emotions = list(
-		"celebrate happily!",
+		"celebrates happily!",
 		"dances around in excitement!",
 	)
 	///our moderate emotions