Merge pull request #53 from Atermonera/exodus_fixes_3

Exodus fixes 3
PolarisSS13 · Sep 29, 2024 · 9e4cbbb · 9e4cbbb
2 parents 49b5cd9 + e1f3d4b
commit 9e4cbbb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/config/example/configuration.txt b/config/example/configuration.txt
@@ -178,7 +178,7 @@ EXPECTED_ROUND_LENGTH 2
 #STACK_CRAFTING_USES_TYPES 1
 
 ## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied.
-#WALK_DELAY 4
+WALK_DELAY 3.5
 
 ##
 # GAME WORLD
@@ -634,3 +634,10 @@ VOTE_AUTOTRANSFER_INITIAL 72000
 
 ## Time period (deciseconds) which voting session will last (default 1 minute).
 #VOTE_PERIOD 600
+
+# Lock viewport to square 15x15
+LOCK_CLIENT_VIEW_X 15
+LOCK_CLIENT_VIEW_Y 15
+
+# Allow loadout customization
+LOADOUT_CUSTOMIZATION
diff --git a/maps/exodus/exodus-2.dmm b/maps/exodus/exodus-2.dmm
@@ -30878,7 +30878,7 @@
 "bns" = (
 /obj/machinery/door/airlock/maintenance{
 	autoset_access = 0;
-	req_access = list("ACCESS_MAINT", "ACCESS_EMERGENCY_STORAGE", "ACCESS_RESEARCH")
+	req_access = list(list("ACCESS_MAINT", "ACCESS_EMERGENCY_STORAGE", "ACCESS_RESEARCH"))
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -37706,7 +37706,7 @@
 /obj/machinery/door/airlock{
 	name = "Starboard Emergency Storage";
 	autoset_access = 0;
-	req_access = list("ACCESS_MAINT", "ACCESS_EMERGENCY_STORAGE", "ACCESS_RESEARCH")
+	req_access = list(list("ACCESS_MAINT", "ACCESS_EMERGENCY_STORAGE", "ACCESS_RESEARCH"))
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -39793,7 +39793,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance{
 	autoset_access = 0;
-	req_access = list("ACCESS_MAINT", "ACCESS_RESEARCH")
+	req_access = list(list("ACCESS_MAINT", "ACCESS_RESEARCH"))
 	},
 /turf/floor/tiled/techfloor/grid,
 /area/exodus/maintenance/research_shuttle)
@@ -39860,7 +39860,7 @@
 "bFy" = (
 /obj/machinery/door/airlock/maintenance{
 	autoset_access = 0;
-	req_access = list("ACCESS_MAINT", "ACCESS_RESEARCH")
+	req_access = list(list("ACCESS_MAINT", "ACCESS_RESEARCH"))
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -42129,7 +42129,7 @@
 	},
 /obj/machinery/door/airlock/maintenance{
 	autoset_access = 0;
-	req_access = list("ACCESS_MAINT", "ACCESS_RESEARCH")
+	req_access = list(list("ACCESS_MAINT", "ACCESS_RESEARCH"))
 	},
 /turf/floor/tiled/techfloor/grid,
 /area/exodus/maintenance/research_port)
@@ -45271,7 +45271,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/airlock/maintenance{
 	autoset_access = 0;
-	req_access = list("ACCESS_MAINT", "ACCESS_RESEARCH")
+	req_access = list(list("ACCESS_MAINT", "ACCESS_RESEARCH"))
 	},
 /turf/floor/tiled/techfloor/grid,
 /area/exodus/maintenance/research_shuttle)
@@ -48835,7 +48835,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/airlock/maintenance{
 	autoset_access = 0;
-	req_access = list("ACCESS_MAINT", "ACCESS_RESEARCH")
+	req_access = list(list("ACCESS_MAINT", "ACCESS_RESEARCH"))
 	},
 /turf/floor/tiled/techfloor/grid,
 /area/exodus/maintenance/research_starboard)
@@ -64846,7 +64846,7 @@
 	},
 /obj/machinery/door/airlock/maintenance{
 	autoset_access = 0;
-	req_access = list("ACCESS_MAINT", "ACCESS_RESEARCH")
+	req_access = list(list("ACCESS_MAINT", "ACCESS_RESEARCH"))
 	},
 /turf/floor/plating,
 /area/exodus/maintenance/research_starboard)

diff --git a/maps/exodus/exodus.dm b/maps/exodus/exodus.dm
@@ -17,6 +17,7 @@
 	#include "../../mods/content/matchmaking/_matchmaking.dme"
 	#include "../../mods/content/modern_earth/_modern_earth.dme"
 	#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
+	#include "../../mods/content/polaris/_polaris.dme"
 	#include "../../mods/content/scaling_descriptors.dm"
 	#include "../../mods/content/xenobiology/_xenobiology.dme"
 

diff --git a/mods/content/polaris/datum/overrides.dm b/mods/content/polaris/datum/overrides.dm
@@ -30,16 +30,18 @@
 
 /datum/appearance_descriptor/age/polaris_human
 	name = "age"
+	chargen_max_index = 9
 	standalone_value_descriptors = list(
 		"an infant" =      1,
 		"a toddler" =      3,
-		"a child" =       12,
-		"a teenager" =    19,
-		"a young adult" = 28,
-		"an adult" =      45,
-		"middle-aged" =   65,
-		"aging" =         90,
-		"elderly" =      110
+		"a child" =        7,
+		"a teenager" =    12,
+		"a young adult" = 17,
+		"an adult" =      28,
+		"middle-aged" =   45,
+		"aging" =         65,
+		"elderly" =       90,
+		"ancient" =      110
 	)
 
 /decl/species/human