Merge pull request #131 from MistakeNot4892/pyrelight

Updating from Neb dev.

Author: MistakeNot4892

.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.