Merge remote-tracking branch 'upstream/master' into universal-damage

code/game/objects/effects/spawners/random_spawners.dm

@@ -186,7 +186,7 @@
 	name = "common loot"
 	icon_state = "x3"
 	spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot
-	// Loot schema: costumes, toys, useless gimmick items, trapped items
+	// Loot schema: costumes, toys, useless gimmick items
 	result = list(/datum/nothing = 13,
 		/obj/item/storage/toolbox/syndicate = 1,
 		/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1,
@@ -201,6 +201,16 @@
 		/obj/item/coin/antagtoken/syndicate = 1,
 		/obj/item/storage/box/syndie_kit/cutouts = 1)
 
+/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin
+	name = "20pc stetchkin"
+	icon_state = "x3"
+	spawn_inside = null
+	result = list(/datum/nothing = 1,
+		/obj/item/wrench = 1,
+		/obj/item/reagent_containers/food/snacks/syndicake = 1,
+		/obj/item/coin/antagtoken/syndicate = 1,
+		/obj/item/gun/projectile/automatic/pistol = 1)
+
 /obj/effect/spawner/random_spawners/syndicate/loot/level2
 	name = "rare loot"
 	// Loot schema: space gear, basic armor, basic ammo (10mm, rcd), drugs, more dangerous/useful gimmick items, lower-value minerals
@@ -291,18 +301,18 @@
 /obj/effect/spawner/random_spawners/syndicate/layout/door
 	name = "50pc door 25pc falsewall 25pc wall"
 	result = list(/obj/machinery/door/airlock/hatch/syndicate = 6,
-		/turf/simulated/wall/r_wall = 2,
-		/obj/structure/falsewall/reinforced = 2)
+		/turf/simulated/wall/mineral/plastitanium/nodiagonal = 2,
+		/obj/structure/falsewall/plastitanium = 2)
 
 /obj/effect/spawner/random_spawners/syndicate/layout/door/secret
 	name = "50pc falsewall 50pc wall"
-	result = list(/turf/simulated/wall/r_wall = 1,
-		/obj/structure/falsewall/reinforced = 1)
+	result = list(/turf/simulated/wall/mineral/plastitanium/nodiagonal = 1,
+		/obj/structure/falsewall/plastitanium = 1)
 
 /obj/effect/spawner/random_spawners/syndicate/layout/door/vault
 	name = "80pc vaultdoor 20pc wall"
 	result = list(/obj/machinery/door/airlock/hatch/syndicate/vault = 4,
-		/turf/simulated/wall/r_wall = 1)
+		/turf/simulated/wall/mineral/plastitanium/nodiagonal = 1)
 
 
 /obj/effect/spawner/random_spawners/syndicate/layout/spacepod

code/game/objects/items/devices/lightreplacer.dm

@@ -238,6 +238,7 @@
 		return 0
 
 /obj/item/lightreplacer/afterattack(atom/T, mob/U, proximity)
+	. = ..()
 	if(!proximity)
 		return
 	if(!isturf(T))

code/game/objects/items/weapons/shields.dm

@@ -58,7 +58,7 @@
 
 /obj/item/shield/energy
 	name = "energy combat shield"
-	desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere."
+	desc = "A shield that reflects almost all energy projectiles, but is useless against physical attacks. It can be retracted, expanded, and stored anywhere."
 	icon_state = "eshield0" // eshield1 for expanded
 	force = 3
 	throwforce = 3

code/game/objects/structures/false_walls.dm

@@ -326,7 +326,7 @@
 	mineral = /obj/item/stack/sheet/mineral/plastitanium
 	walltype = /turf/simulated/wall/mineral/plastitanium
 	smooth = SMOOTH_MORE
-	canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
+	canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
 
 /obj/structure/falsewall/brass
 	name = "clockwork wall"
@@ -345,4 +345,3 @@
 	var/turf/T = get_turf(src)
 	new /obj/effect/temp_visual/ratvar/wall/false(T)
 	new /obj/effect/temp_visual/ratvar/beam/falsewall(T)
-