Updating from Neb dev.

.github/workflows/generate_documentation.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  SPACEMAN_DMM_VERSION: suite-1.9
+  SPACEMAN_DMM_VERSION: suite-1.11
 
 jobs:
   generate_documentation:

.github/workflows/test.yml

@@ -14,13 +14,13 @@ on:
   workflow_dispatch:
 
 env:
-  BYOND_MAJOR: "515"
-  BYOND_MINOR: "1647"
-  SPACEMAN_DMM_VERSION: suite-1.9
+  BYOND_MAJOR: "516"
+  BYOND_MINOR: "1663"
+  SPACEMAN_DMM_VERSION: suite-1.11
 
 jobs:
   DreamChecker:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Setup Cache
@@ -52,7 +52,7 @@ jobs:
           chmod +x send.sh
           ./send.sh failure $WEBHOOK_URL
   OpenDream:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Python setup
@@ -69,7 +69,7 @@ jobs:
       - name: Run OpenDream
         run: ./DMCompiler_linux-x64/DMCompiler nebula.dme --define=UNIT_TEST --suppress-unimplemented --skip-anything-typecheck --version=${BYOND_MAJOR}.${BYOND_MINOR} | bash test/annotate_od.sh
   Code:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Setup Cache
@@ -95,7 +95,7 @@ jobs:
           chmod +x send.sh
           ./send.sh failure $WEBHOOK_URL
   Maps:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         map_path: [example, tradeship, exodus, ministation, shaded_hills, karzerfeste, away_sites_testing, modpack_testing, planets_testing]

code/__defines/hydroponics.dm

@@ -62,3 +62,9 @@
 #define GROWTH_VINES      		  "vines"
 #define GROWTH_BIOMASS         	  "mass"
 #define GROWTH_MOLD          	  "mold"
+
+#define PLANT_SEG_BODY "body" // Non-dissectable plants
+
+#define PLANT_STATE_FRESH   "fresh"
+#define PLANT_STATE_ROASTED "roasted"
+#define PLANT_STATE_DRIED   "dried"

code/__defines/tools.dm

@@ -17,6 +17,7 @@
 #define TOOL_PEN            /decl/tool_archetype/pen
 #define TOOL_STAMP          /decl/tool_archetype/stamp
 #define TOOL_SHEARS         /decl/tool_archetype/shears
+#define TOOL_CHISEL         /decl/tool_archetype/chisel
 
 // Surgical tools.
 #define TOOL_SCALPEL        /decl/tool_archetype/scalpel
@@ -63,7 +64,7 @@
 #define IS_HAMMER(A)      IS_TOOL(A, TOOL_HAMMER)
 #define IS_HOE(A)         IS_TOOL(A, TOOL_HOE)
 #define IS_SHEARS(A)      IS_TOOL(A, TOOL_SHEARS)
-
+#define IS_CHISEL(A)      IS_TOOL(A, TOOL_CHISEL)
 #define IS_HEMOSTAT(A)    IS_TOOL(A, TOOL_HEMOSTAT)
 #define IS_RETRACTOR(A)   IS_TOOL(A, TOOL_RETRACTOR)
 

code/__globals.dm

@@ -1,7 +1,8 @@
 // Defined here due to being used immediately below.
 #define GET_DECL(D) (ispath(D, /decl) ? (decls_repository.fetched_decls[D] || decls_repository.get_decl(D)) : null)
 #define IMPLIED_DECL GET_DECL(__IMPLIED_TYPE__)
-#define RESOLVE_TO_DECL(D) (istype(D, /decl) ? D : GET_DECL(D))
+#define RESOLVE_TO_DECL(D) (istype(D, /decl) ? D : (istext(D) ? decls_repository.get_decl_by_id(D, validate_decl_type = FALSE) : GET_DECL(D)))
+#define DECLS_ARE_EQUIVALENT(F, S) ((RESOLVE_TO_DECL(F) == RESOLVE_TO_DECL(S)))
 
 // Defined here due to compile order; overrides in macros make the compiler complain.
 /decl/global_vars

code/_helpers/logging.dm

@@ -212,6 +212,8 @@ var/global/log_end= world.system_type == UNIX ? ascii2text(13) : ""
 		return json_encode(d)
 	return d.get_log_info_line()
 
+var/global/_gag_report_progress = 0
 /proc/report_progress(var/progress_message)
-	admin_notice("<span class='boldannounce'>[progress_message]</span>", R_DEBUG)
-	log_world(progress_message)
+	if(global._gag_report_progress <= 0)
+		admin_notice("<span class='boldannounce'>[progress_message]</span>", R_DEBUG)
+		to_world_log(progress_message)

code/_helpers/mobs.dm

@@ -13,7 +13,8 @@
 		if(current_species)
 			var/decl/background_detail/background = current_species.get_default_background_datum_by_flag(BACKGROUND_FLAG_NAMING)
 			if(background)
-				return background.get_random_name(null, gender)
+				return background.get_random_cultural_name(gender = gender, species = species)
+
 	return capitalize(pick(gender == FEMALE ? global.using_map.first_names_female : global.using_map.first_names_male)) + " " + capitalize(pick(global.using_map.last_names))
 
 /proc/random_skin_tone(var/decl/bodytype/current_bodytype)

code/_helpers/unsorted.dm

@@ -715,7 +715,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 Checks if that loc and dir has a item on the wall
 */
 var/global/list/WALLITEMS = list(
-	/obj/machinery/power/apc, /obj/machinery/alarm, /obj/item/radio/intercom,
+	/obj/machinery/apc, /obj/machinery/alarm, /obj/item/radio/intercom,
 	/obj/structure/extinguisher_cabinet, /obj/structure/reagent_dispensers/peppertank,
 	/obj/machinery/status_display, /obj/machinery/network/requests_console, /obj/machinery/light_switch, /obj/structure/sign,
 	/obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard,

code/_onclick/ai.dm

@@ -158,7 +158,7 @@
 		Topic(src, list("command"="bolts", "activate" = "1"))
 	return TRUE
 
-/obj/machinery/power/apc/AICtrlClick(mob/living/silicon/user) // turns off/on APCs.
+/obj/machinery/apc/AICtrlClick(mob/living/silicon/user) // turns off/on APCs.
 	if(user.incapacitated())
 		return FALSE
 	Topic(src, list("breaker"="1"))

code/_onclick/cyborg.dm

@@ -121,7 +121,7 @@
 /obj/machinery/door/airlock/BorgCtrlClick(mob/living/silicon/robot/user) // Bolts doors. Forwards to AI code.
 	return AICtrlClick(user)
 
-/obj/machinery/power/apc/BorgCtrlClick(mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
+/obj/machinery/apc/BorgCtrlClick(mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
 	return AICtrlClick(user)
 
 /obj/machinery/turretid/BorgCtrlClick(mob/living/silicon/robot/user) //turret control on/off. Forwards to AI code.

code/_onclick/hud/hud_elements/hud_robot.dm

@@ -1,5 +1,4 @@
 /datum/hud/robot
-	offset_hands_vertically = FALSE
 	gun_mode_toggle_type    = /obj/screen/gun/mode
 	omit_hud_elements       = list(
 		/decl/hud_element/health,

code/_onclick/hud/hud_types/_hud.dm

@@ -99,8 +99,6 @@
 	VAR_PRIVATE/obj/screen/gun/item/gun_item_use_toggle
 	VAR_PRIVATE/obj/screen/gun/radio/gun_radio_use_toggle
 
-	var/offset_hands_vertically = TRUE
-
 /datum/hud/New(mob/_owner)
 	if(istype(_owner))
 		owner = weakref(_owner)
@@ -353,30 +351,18 @@
 			qdel(inv_box)
 
 	// Rebuild offsets for the hand elements.
+	var/const/elems_per_row = 4
 	var/hand_y_offset = 21
 	var/list/elements = hud_elements_hands?.Copy()
-	if(length(elements))
-		if(offset_hands_vertically)
-			while(length(elements))
-				var/copy_index = min(length(elements), 2)+1
-				var/list/sublist = elements.Copy(1, copy_index)
-				elements.Cut(1, copy_index)
-				var/obj/screen/inventory/inv_box
-				if(length(sublist) == 1)
-					inv_box = sublist[1]
-					inv_box.screen_loc = "CENTER,BOTTOM:[hand_y_offset]"
-				else
-					inv_box = sublist[1]
-					inv_box.screen_loc = "CENTER:-[world.icon_size/2],BOTTOM:[hand_y_offset]"
-					inv_box = sublist[2]
-					inv_box.screen_loc = "CENTER:[world.icon_size/2],BOTTOM:[hand_y_offset]"
-				hand_y_offset += world.icon_size
-		else
-			var/hand_x_offset = -((length(elements) * world.icon_size) / 2) + (world.icon_size/2)
-			for(var/obj/screen/inventory/inv_box in elements)
-				inv_box.screen_loc = "CENTER:[hand_x_offset],BOTTOM:[hand_y_offset]"
-				hand_x_offset += world.icon_size
-			hand_y_offset += world.icon_size
+	while(length(elements))
+		var/copy_index = min(length(elements), elems_per_row)+1
+		var/list/sublist = elements.Copy(1, copy_index)
+		elements.Cut(1, copy_index)
+		var/hand_x_offset = (world.icon_size/2) * (1 - length(sublist))
+		for(var/obj/screen/inventory/inv_box in sublist)
+			inv_box.screen_loc = "CENTER:[hand_x_offset],BOTTOM:[hand_y_offset]"
+			hand_x_offset += world.icon_size
+		hand_y_offset += world.icon_size
 
 	if(mymob.client && islist(hud_elements_hands) && length(hud_elements_hands))
 		mymob.client.screen |= hud_elements_hands

code/controllers/subsystems/initialization/codex_dump.dm

@@ -129,7 +129,7 @@ TODO: work out how to implement an external search function.
 	// Copied from del_the_world UT exceptions list.
 	var/static/list/skip_types = typesof(
 		/obj/item/organ/external/chest,
-		/obj/machinery/power/apc,
+		/obj/machinery/apc,
 		/obj/machinery/alarm,
 		/obj/structure/stairs
 	)

code/controllers/subsystems/mapping.dm

@@ -10,6 +10,7 @@ SUBSYSTEM_DEF(mapping)
 	var/list/submaps =                   list()
 	var/list/map_templates_by_category = list()
 	var/list/map_templates_by_type =     list()
+	var/list/spawnable_map_templates =   list()
 	var/list/banned_maps =               list()
 	var/list/banned_template_names =     list()
 
@@ -169,11 +170,15 @@ SUBSYSTEM_DEF(mapping)
 	map_templates =             SSmapping.map_templates
 	map_templates_by_category = SSmapping.map_templates_by_category
 	map_templates_by_type =     SSmapping.map_templates_by_type
+	spawnable_map_templates =   SSmapping.spawnable_map_templates
 
 /datum/controller/subsystem/mapping/proc/register_map_template(var/datum/map_template/map_template)
 	if(!validate_map_template(map_template) || !map_template.preload())
 		return FALSE
-	map_templates[map_template.name] = map_template
+	map_templates[map_template.name]         = map_template
+	map_templates_by_type[map_template.type] = map_template
+	if(map_template.is_spawnable)
+		spawnable_map_templates += map_template
 	for(var/temple_cat in map_template.template_categories) // :3
 		LAZYINITLIST(map_templates_by_category[temple_cat])
 		LAZYSET(map_templates_by_category[temple_cat], map_template.name, map_template)

code/datums/composite_sounds/_composite_sound.dm

@@ -6,7 +6,7 @@
 	start_length	(num)					How long to wait before starting the main loop after playing start_sound
 	end_sound		(soundfile)				The sound played after the main loop has concluded
 	chance			(num)					Chance per loop to play a mid_sound
-	volume			(num)					Sound output volume
+	play_volume		(num)					Sound output volume
 	max_loops		(num)					The max amount of loops to run for.
 	direct			(bool)					If true plays directly to provided atoms instead of from them
 */
@@ -19,7 +19,7 @@
 	var/start_length
 	var/end_sound
 	var/chance
-	var/volume = 100
+	var/play_volume = 100
 	var/max_loops
 	var/direct
 	var/timerid
@@ -71,7 +71,7 @@
 /datum/composite_sound/proc/play(soundfile)
 	var/sound/S = sound(soundfile)
 	for(var/atom/thing as anything in output_atoms)
-		playsound(thing, S, volume)
+		playsound(thing, S, play_volume)
 
 /datum/composite_sound/proc/get_sound(starttime, _mid_sounds)
 	. = _mid_sounds || mid_sounds

code/datums/composite_sounds/fire_sounds.dm

@@ -11,12 +11,12 @@
 	)
 	mid_length = 10
 	end_sound = 'sound/ambience/firecrackle06.ogg'
-	volume = 10
+	play_volume = 10
 
 /datum/composite_sound/grill
 	start_sound = 'sound/machines/kitchen/grill/grill-start.ogg'
 	start_length = 10
 	mid_sounds = list('sound/machines/kitchen/grill/grill-mid1.ogg'=10)
 	mid_length = 40
 	end_sound = 'sound/machines/kitchen/grill/grill-stop.ogg'
-	volume = 50
+	play_volume = 50

code/datums/composite_sounds/loom.dm

@@ -9,7 +9,7 @@
 		'sound/items/loom3.ogg'
 	)
 	end_sound    = 'sound/items/loomstop.ogg'
-	volume       = 40
+	play_volume  = 40
 
 // Spinning wheel sampled from 'Wooden Spinning Wheel' by Kessir on freesound.org: https://freesound.org/people/kessir/sounds/414554/
 /datum/composite_sound/spinning_wheel_working
@@ -22,4 +22,4 @@
 		'sound/items/spinningwheel3.ogg'
 	)
 	end_sound    = 'sound/items/spinningwheelstop.ogg'
-	volume       = 60
+	play_volume  = 60

code/datums/composite_sounds/machinery_sounds.dm

@@ -4,4 +4,4 @@
 	mid_sounds = list('sound/machines/microwave/microwave-mid1.ogg'=10, 'sound/machines/microwave/microwave-mid2.ogg'=1)
 	mid_length = 10
 	end_sound = 'sound/machines/microwave/microwave-end.ogg'
-	volume = 1
+	play_volume = 1

code/datums/extensions/abilities/abilities_predator.dm

@@ -56,23 +56,44 @@
 		to_chat(user, SPAN_WARNING("\The [victim] is too big for you to dismember."))
 		return TRUE
 
+	var/target_zone = user.get_target_zone()
+	var/obj/item/organ/external/limb = victim.get_organ(target_zone)
+	if(!limb)
+		to_chat(user, SPAN_WARNING("\The [victim] is missing that limb!"))
+		return TRUE
+
 	to_chat(user, SPAN_NOTICE("You dig into \the [victim], hunting for something edible."))
 	if(!do_after(user, max(2 SECONDS, victim.get_object_size() * 5), victim) || QDELETED(victim) || !victim.butchery_data || victim.stat != DEAD)
 		return TRUE
 
+	// Changing zone means we cancel.
+	if(target_zone != user.get_target_zone())
+		return
+
 	var/list/external_organs = victim.get_external_organs()
 	if(length(external_organs) <= 1)
 		user.visible_message(SPAN_DANGER("\The [user] tears \the [victim] apart!"))
 		victim.gib()
 		return TRUE
 
-	var/obj/item/organ/external/limb = victim.get_organ(user.get_target_zone())
+	limb = victim.get_organ(target_zone) // In case it was removed in the interim.
 	if(!limb)
 		to_chat(user, SPAN_WARNING("\The [victim] is missing that limb!"))
 		return TRUE
 
-	user.visible_message(SPAN_DANGER("\The [user] tears \the [limb] from \the [victim]!"))
-	limb.dismember(FALSE, DISMEMBER_METHOD_EDGE, silent = TRUE)
-	if(!QDELETED(limb))
-		user.put_in_hands(limb)
+	if(length(limb.internal_organs))
+		var/obj/item/organ/internal/stolen = pick(limb.internal_organs)
+		user.visible_message(SPAN_DANGER("\The [user] tears \the [stolen] out of \the [victim]'s [limb.name]!"))
+		victim.remove_organ(stolen, TRUE, TRUE)
+		if(!QDELETED(stolen))
+			user.put_in_hands(stolen)
+		return TRUE
+
+	if(!(limb.limb_flags & ORGAN_FLAG_CAN_AMPUTATE))
+		to_chat(user, SPAN_WARNING("You gnaw on \the [victim]'s [limb.name], but can't pull it loose."))
+	else
+		user.visible_message(SPAN_DANGER("\The [user] tears \the [limb] from \the [victim]!"))
+		limb.dismember(FALSE, DISMEMBER_METHOD_EDGE, silent = TRUE)
+		if(!QDELETED(limb))
+			user.put_in_hands(limb)
 	return TRUE

code/datums/extensions/milkable/milkable.dm

@@ -85,7 +85,7 @@
 			to_chat(user, SPAN_WARNING("Wait for \the [critter] to stop moving before you try milking it."))
 			return TRUE
 
-	if(container.reagents.total_volume >= container.volume)
+	if(REAGENTS_FREE_SPACE(container.reagents) <= 0)
 		to_chat(user, SPAN_WARNING("\The [container] is full."))
 		return TRUE
 
@@ -112,7 +112,7 @@
 		to_chat(user, SPAN_WARNING("\The [critter]'s udder is dry. Wait a little longer."))
 		return TRUE
 
-	if(container.reagents.total_volume >= container.volume)
+	if(REAGENTS_FREE_SPACE(container.reagents) <= 0)
 		to_chat(user, SPAN_NOTICE("\The [container] is full."))
 		return TRUE
 

code/datums/music_tracks/_music_track.dm

@@ -5,7 +5,7 @@
 	var/decl/license/license
 	var/song
 	var/url // Remember to include http:// or https:// or BYOND will be sad
-	var/volume = 70
+	var/music_volume = 70
 	abstract_type = /decl/music_track
 
 /decl/music_track/Initialize()
@@ -34,7 +34,7 @@
 		to_chat(listener, url)
 
 	to_chat(listener, "<span class='good'>License: <a href='[license.url]'>[license.name]</a></span>")
-	sound_to(listener, sound(song, repeat = 1, wait = 0, volume = volume, channel = sound_channels.lobby_channel))
+	sound_to(listener, sound(song, repeat = 1, wait = 0, volume = music_volume, channel = sound_channels.lobby_channel))
 
 // No VV editing anything about music tracks
 /decl/music_track/VV_static()