Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/_rendering/parallax/parallax_holder.dm

@@ -174,7 +174,7 @@
 		L.SetView(C.view, TRUE)
 		. |= L
 	C.screen |= .
-	if(!secondary_map)
+	if(!secondary_map && (owner.prefs.parallax != PARALLAX_DISABLE))
 		var/atom/movable/screen/plane_master/parallax_white/PM = locate() in C.screen
 		if(PM)
 			PM.color =  list(

code/game/objects/items/shooting_range.dm

@@ -34,6 +34,7 @@
 /obj/item/target/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(pinnedLoc)
 		pinnedLoc.removeTarget(user)
+	. = ..()
 
 /obj/item/target/syndicate
 	icon_state = "target_s"

code/game/objects/structures/target_stake.dm

@@ -58,13 +58,10 @@
 	pinned_target.nullPinnedLoc()
 	nullPinnedTarget()
 	handle_density()
-	if(ishuman(user))
-		if(!user.get_active_held_item())
-			user.put_in_hands(pinned_target)
-			to_chat(user, "<span class='notice'>You take the target out of the stake.</span>")
-	else
-		pinned_target.forceMove(user.drop_location())
-		to_chat(user, "<span class='notice'>You take the target out of the stake.</span>")
+	pinned_target.forceMove(get_turf(src))
+	to_chat(user, "<span class='notice'>You take the target out of the stake.</span>")
+	if(user.can_hold_items())
+		user.put_in_hands(pinned_target)
 
 /obj/structure/target_stake/bullet_act(obj/item/projectile/P)
 	if(pinned_target)

html/changelogs/archive/2022-02.yml

@@ -128,3 +128,20 @@
   - bugfix: '[Omega] Toxins Mix Chamber no longer starts bolted'
   - bugfix: '[Omega] Missing pipe above Security leading into Perma'
   - bugfix: '[Omega] Secure Tech Storage now properly has an area'
+2022-02-23:
+  SandPoot:
+  - bugfix: You know the training targets? You can grab them again now with your own
+      hands, instead of using telekinesis.
+  TripleShades:
+  - rscadd: '[Omega] Trash chute to space in Virology'
+  - rscadd: '[Omega] Trash chute to space in Xenobiology'
+  - rscadd: '[Omega] Airlock leading out to Supermatter cooling pipeline'
+  - rscadd: '[Omega] Two more air pumps to Toxins'
+  - rscadd: '[Omega] Robotics circuitry printer'
+  - rscadd: '[Omega] Windoor to Cargo delivery flaps'
+  - rscdel: '[Omega] Backdoor to Gravity Generator'
+  - rscdel: '[Omega] Bunched up cameras tweak: [Omega] Pipes leading to the Incinerator
+      burn chamber are now black tweak: [Omega] Gravity Generator airlocks are now
+      accessible by engineers tweak: [Omega] Chapel mass driver and mass driver bulkhead
+      are now controlled by one button instead of two'
+  - bugfix: '[Omega] Lawyer''s carpet is no longer airless'