Merge remote-tracking branch 'upstream/master' into Swamp-revamp

code/game/machinery/autolathe/artist_bench.dm

@@ -320,8 +320,14 @@
 
 	var/obj/artwork = choose_full_art(ins_used, user)
 	var/datum/design/art
-	if(isobj(artwork))
+	if (isobj(artwork))
 		art = new()
+		var/setname = sanitizeSafe(input(user,"Name your creation. Keep empty for a random name.","Set Name",""), MAX_NAME_LEN)
+		if (setname)
+			artwork.name = setname
+		var/setdesc = sanitizeSafe(input(user,"Describe your creation. Keep empty for a random description.","Set Description",""), MAX_DESC_LEN)
+		if (setdesc)
+			artwork.desc = setdesc
 		randomize_materialas(artwork)
 		art.build_path = artwork.type
 		art.AssembleDesignInfo(artwork)

code/game/machinery/vendor/food_vendors.dm

@@ -179,13 +179,15 @@
 					/obj/item/seeds/cinnamonseed = 2,
 					/obj/item/seeds/cocoapodseed = 3,
 					/obj/item/seeds/cornseed = 3,
+					/obj/item/seeds/curtainweedseed = 2,
 					/obj/item/seeds/eggplantseed = 3,
 					/obj/item/seeds/gelthi = 2,
 					/obj/item/seeds/grapeseed = 3,
 					/obj/item/seeds/grassseed = 3,
 					/obj/item/seeds/lemonseed = 3,
 					/obj/item/seeds/limeseed = 3,
 					/obj/item/seeds/mintseed = 2,
+					/obj/item/seeds/moontearseed = 2,
 					/obj/item/seeds/orangeseed = 3,
 					/obj/item/seeds/peanutseed = 3,
 					/obj/item/seeds/pineappleseed = 2,
@@ -196,19 +198,16 @@
 					/obj/item/seeds/pumpkinseed = 3,
 					/obj/item/seeds/riceseed = 3,
 					/obj/item/seeds/soyaseed = 3,
+					/obj/item/seeds/spacealocasiaseed = 2,
 					/obj/item/seeds/strawberryseed = 3,
 					/obj/item/seeds/sugarcaneseed = 3,
 					/obj/item/seeds/sunflowerseed = 3,
-					/obj/item/seeds/thaadra = 2,
 					/obj/item/seeds/thaadra = 3,
 					/obj/item/seeds/tomatoseed = 3,
 					/obj/item/seeds/towermycelium = 3,
 					/obj/item/seeds/watermelonseed = 3,
 					/obj/item/seeds/wheatseed = 3,
 					/obj/item/seeds/whitebeetseed = 3,
-					/obj/item/seeds/moontearseed = 2,
-					/obj/item/seeds/spacealocasiaseed = 2,
-					/obj/item/seeds/curtainweedseed = 2,
 					)
 
 	contraband = list(
@@ -271,7 +270,6 @@
 					/obj/item/seeds/strawberryseed = 3,
 					/obj/item/seeds/sugarcaneseed = 3,
 					/obj/item/seeds/sunflowerseed = 3,
-					/obj/item/seeds/thaadra = 2,
 					/obj/item/seeds/thaadra = 3,
 					/obj/item/seeds/tomatoseed = 3,
 					/obj/item/seeds/towermycelium = 3,

code/modules/cooking_with_jane/recipes/recipe.dm

@@ -315,7 +315,7 @@
 	step_builder = list(
 		list(CWJ_ADD_REAGENT, "cornoil", 2),
 		list(CWJ_ADD_REAGENT, "egg", 3),
-		list(CWJ_ADD_PRODUCE, "sodiumchloride", 1),
+		list(CWJ_ADD_REAGENT, "sodiumchloride", 1),
 		list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/meat/pork, qmod=0.5),
 		list(CWJ_ADD_REAGENT, "flour", 5),
 		list(CWJ_USE_STOVE, J_MED, 40 SECONDS)

code/modules/hydroponics/seed_gene_presets.dm

@@ -411,10 +411,10 @@
 
 /obj/item/computer_hardware/hard_drive/portable/plantgene/special/chem_producer
 	disk_name = "plant gene disk - chem producer"
-	trait_info = "chemical sprayer"
+	trait_info = "chemical producer"
 	preset_values = list(TRAIT_CHEM_PRODUCTION = 1)
 
 /obj/item/computer_hardware/hard_drive/portable/plantgene/special/no_chem_producer
 	disk_name = "plant gene disk - non-chem producer"
-	trait_info = "non-sprayer"
+	trait_info = "non chemical producer"
 	preset_values = list(TRAIT_CHEM_PRODUCTION = 0)

code/modules/mob/inventory.dm

@@ -151,9 +151,9 @@
 /mob/proc/unEquip(obj/item/I, var/atom/Target = null, force = 0) //Force overrides NODROP for things like wizarditis and admin undress.
 	if(!canUnEquip(I))
 		return
-	//Removed until we have features that need them, so these aren't being rapid-fired needlessly. - Hex
-	//LEGACY_SEND_SIGNAL(src, COMSIG_CLOTH_DROPPED, I)
-	//LEGACY_SEND_SIGNAL(I, COMSIG_CLOTH_DROPPED, src)
+	if(I)
+		LEGACY_SEND_SIGNAL(src, COMSIG_CLOTH_DROPPED, I)
+		LEGACY_SEND_SIGNAL(I, COMSIG_CLOTH_DROPPED, src)
 	return drop_from_inventory(I,Target)
 
 //Attemps to remove an object on a mob.

code/modules/psionics/psion_powers/gear_summoning_powers.dm

@@ -145,7 +145,11 @@
 			shield.can_block_proj = TRUE
 			shield.base_block_chance += 10
 			shield.adjustShieldDurability(-10, user)
-		usr.put_in_active_hand(shield)
+		if(usr.put_in_active_hand(shield))
+			return
+		STOP_PROCESSING(SSobj, shield)
+		qdel(shield)
+
 
 /mob/living/carbon/human/proc/psionic_shield_layered()
 	set category = "Psionic powers"
@@ -162,7 +166,10 @@
 			"You feel the rush of electric essence shocking your hand lightly before a psy-shield forms!"
 			)
 		playsound(usr.loc, pick('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg'), 50, 1, -3)
-		usr.put_in_active_hand(shield)
+		if(usr.put_in_active_hand(shield))
+			return
+		STOP_PROCESSING(SSobj, shield)
+		qdel(shield)
 
 
 /mob/living/carbon/human/proc/telekinetic_fist()

maps/__Nadezhda/map/_Nadezhda_Colony.dmm

@@ -41335,16 +41335,17 @@
 	name = "Bridge";
 	req_access = list(19)
 	},
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/door/firedoor,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel/gray_perforated,
 /area/nadezhda/command/hallway)
 "hQM" = (
@@ -45214,6 +45215,16 @@
 /obj/structure/flora/small/busha1,
 /turf/simulated/floor/asteroid/grass,
 /area/nadezhda/crew_quarters/bar)
+"iBA" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/dark,
+/area/nadezhda/command/hallway)
 "iBD" = (
 /obj/random/scrap/sparse_even,
 /turf/simulated/floor/industrial/bricks,
@@ -54862,6 +54873,7 @@
 /obj/structure/bed/chair/office/light{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white/gray_perforated,
 /area/nadezhda/command/hallway)
 "kuz" = (
@@ -61344,6 +61356,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/industrial,
 /area/nadezhda/maintenance/undergroundfloor1east)
+"lLq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair/office/light{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber,
+/turf/simulated/floor/tiled/white/gray_perforated,
+/area/nadezhda/command/hallway)
 "lLA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/random/mob/spiders,
@@ -64334,6 +64354,9 @@
 /obj/item/modular_computer/console/preset/medical/monitor{
 	dir = 8
 	},
+/obj/machinery/alarm{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/command/hallway)
 "mnz" = (
@@ -71452,14 +71475,14 @@
 /area/nadezhda/maintenance/undergroundfloor1north)
 "nDi" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/blue,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
 /obj/structure/disposalpipe/junction{
 	dir = 1;
 	icon_state = "pipe-j2"
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /turf/simulated/floor/tiled/dark,
 /area/nadezhda/command/hallway)
 "nDl" = (
@@ -96190,6 +96213,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/nadezhda/crew_quarters/hydroponics/garden)
+"skR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair/office/light{
+	dir = 8
+	},
+/obj/machinery/atmospherics/unary/vent_pump,
+/turf/simulated/floor/tiled/white/gray_perforated,
+/area/nadezhda/command/hallway)
 "skU" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -101852,6 +101883,12 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/nadezhda/command/hallway)
 "tpN" = (
@@ -101985,6 +102022,7 @@
 /obj/structure/bed/chair/office/light{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white/gray_perforated,
 /area/nadezhda/command/hallway)
 "tra" = (
@@ -109914,6 +109952,19 @@
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/industrial/bricks,
 /area/nadezhda/dungeon/outside/burned_outpost)
+"uNU" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/nadezhda/command/hallway)
 "uNW" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/wood/wild4,
@@ -191151,9 +191202,9 @@ vaK
 jJU
 tPi
 xET
+skR
 kuq
-kuq
-tpH
+iBA
 bix
 cDE
 gku
@@ -191353,9 +191404,9 @@ vaK
 jJU
 hpk
 xET
+lLq
 tqS
-tqS
-tpH
+uNU
 voC
 vWu
 dzS