Merge branch 'Bubberstation:master' into master

SPLURT-Station · Jun 15, 2024 · 0c2fc43 · 0c2fc43
2 parents 5079e15 + 768c2e5
commit 0c2fc43
Show file tree

Hide file tree

Showing 290 changed files with 44,428 additions and 44,421 deletions.
diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm
diff --git a/_maps/moonstation.json b/_maps/moonstation.json
@@ -28,7 +28,7 @@
 			"Mining": true,
 			"Linkage": null,
 			"Gravity": true,
-			"Baseturf": "/turf/open/misc/moonstation_rock/cave",
+			"Baseturf": "/turf/open/misc/moonstation_rock",
 			"No Parallax": true
 		},
 		{

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -38,7 +38,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
 	/turf/open/openspace,
-	/turf/open/space/openspace
+	/turf/open/space/openspace,
+	/turf/open/chasm/moonstation //BUBBERSTATION ADDITION
 	)))
 
 #define isopenspaceturf(A) (is_type_in_typecache(A, GLOB.turfs_openspace))

diff --git a/code/__DEFINES/surgery.dm b/code/__DEFINES/surgery.dm
@@ -30,7 +30,7 @@
 #define ORGAN_PROMINENT (1<<11)
 // SKYRAT EDIT START - Customization
 /// Synthetic organ granted by a species (for use for organ replacements between species)
-#define ORGAN_SYNTHETIC_FROM_SPECIES (1<<11)
+#define ORGAN_SYNTHETIC_FROM_SPECIES (1<<12) // BUBBER EDIT - REMOVE WHEN SKYRAT FIXED TO 12
 // SKYRAT EDIT END
 /// Helper to figure out if a limb is organic
 #define IS_ORGANIC_LIMB(limb) (limb.bodytype & BODYTYPE_ORGANIC)

diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
@@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		/obj/machinery/computer/gateway_control,
 	)))
 
-GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
+GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module) - /datum/ai_module/destructive/nuke_station) //BUBBERSTATION CHANGE: REMOVES NUKE STATION ROUNDSTART MODULE
 
 /// The malf AI action subtype. All malf actions are subtypes of this.
 /datum/action/innate/ai

diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm
@@ -74,7 +74,9 @@
 	SHOULD_CALL_PARENT(TRUE)
 	if(occurrences >= max_occurrences)
 		return FALSE
-	if(!roundstart && earliest_start >= world.time-SSticker.round_start_time ) // BUBBER EDIT: Roundstart checks added
+	if(!roundstart && !SSticker.HasRoundStarted()) // BUBBER EDIT: Roundstart checks added
+		return FALSE
+	if(weight == 0) // BUBBER EDIT: Weight check added
 		return FALSE
 	if(!allow_magic && wizardevent != SSevents.wizardmode)
 		return FALSE

diff --git a/html/changelogs/AutoChangeLog-pr-1547.yml b/html/changelogs/AutoChangeLog-pr-1547.yml
@@ -0,0 +1,4 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+  - rscdel: "Malfunctioning AIs can no longer purchase the \"Nuke Station\" module."
diff --git a/html/changelogs/AutoChangeLog-pr-1578.yml b/html/changelogs/AutoChangeLog-pr-1578.yml
@@ -0,0 +1,4 @@
+author: "theselfish"
+delete-after: True
+changes:
+  - rscadd: "Marge has breached containment."
diff --git a/html/changelogs/AutoChangeLog-pr-1624.yml b/html/changelogs/AutoChangeLog-pr-1624.yml
@@ -0,0 +1,4 @@
+author: "theselfish"
+delete-after: True
+changes:
+  - bugfix: "MASSIVE File Structure clean-up."
diff --git a/html/changelogs/AutoChangeLog-pr-1630.yml b/html/changelogs/AutoChangeLog-pr-1630.yml
@@ -0,0 +1,4 @@
+author: "Majkl-J"
+delete-after: True
+changes:
+  - code_imp: "The storyteller failed to pick events runtime now includes more information"
diff --git a/html/changelogs/AutoChangeLog-pr-1634.yml b/html/changelogs/AutoChangeLog-pr-1634.yml
@@ -0,0 +1,4 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+  - balance: "Makes the exterior of Moonstation more enclosed."
diff --git a/html/changelogs/AutoChangeLog-pr-1642.yml b/html/changelogs/AutoChangeLog-pr-1642.yml
@@ -0,0 +1,4 @@
+author: "pixelkitty286"
+delete-after: True
+changes:
+  - bugfix: "engineering borg BRPED upgrade re-added"
diff --git a/html/changelogs/AutoChangeLog-pr-1643.yml b/html/changelogs/AutoChangeLog-pr-1643.yml
@@ -0,0 +1,4 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+  - bugfix: "Fixes the second layer of moonstation creating space turfs."
diff --git a/modular_skyrat/modules/borgs/code/robot_items.dm b/modular_skyrat/modules/borgs/code/robot_items.dm
@@ -610,7 +610,7 @@
 			"Syndicate" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "synd_sec"),
 			"Spider Clan" = image(icon = CYBORG_ICON_NINJA, icon_state = "ninja_engi"),
 			//Bubber addition start
-			"Research" = image(icon = 'modular_zubbers/modules/borgs/sprites/robot_sci.dmi', icon_state = "research"),
+			"Research" = image(icon = 'modular_zubbers/code/modules/borgs/sprites/robot_sci.dmi', icon_state = "research"),
 			//Bubber addition end
 		))
 		var/model_selection = show_radial_menu(user, user, model_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 42, require_near = TRUE)

diff --git a/modular_zubbers/code/game/objects/items/more_pkas.dm b/modular_zubbers/code/game/objects/items/more_pkas.dm
@@ -220,6 +220,7 @@
 							/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters,
 							/area/icemoon/underground/unexplored/rivers/deep/shoreline,
 							/area/icemoon/underground/explored,
+							/area/moonstation/surface,
 							/area/moonstation/surface/unexplored,
 							/area/moonstation/underground,
 							/area/moonstation/underground/unexplored,
@@ -230,7 +231,8 @@
 							/area/lavaland/surface/outdoors/unexplored,
 							/area/lavaland/surface/outdoors/explored,
 							/area/ocean/generated,
-							/area/ruin/)
+							/area/ruin/
+						)
 
 /obj/item/firing_pin/wastes/pin_auth(mob/living/user)
 	if(!istype(user))

diff --git a/modular_zubbers/code/game/objects/items/robot/items/storage.dm b/modular_zubbers/code/game/objects/items/robot/items/storage.dm
@@ -8,7 +8,7 @@
 /obj/item/borg/apparatus/research
 	name = "Research manipulation gripper"
 	desc = "A simple grasping tool suited to assist in a wide array of research applications."
-	icon = 'modular_zubbers/modules/borgs/sprites/robot_items.dmi'
+	icon = 'modular_zubbers/code/modules/borgs/sprites/robot_items.dmi'
 	icon_state = "gripper_sci"
 	storable = list(
 					/obj/item/slime_extract,
@@ -35,7 +35,7 @@
 /obj/item/borg/apparatus/circuit_sci
 	name = "Research circuit assembly gripper"
 	desc = "A complex grasping tool used for working with circuitry."
-	icon = 'modular_zubbers/modules/borgs/sprites/robot_items.dmi'
+	icon = 'modular_zubbers/code/modules/borgs/sprites/robot_items.dmi'
 	icon_state = "gripper_circ"
 	storable = list(
 					/obj/item/circuitboard,

diff --git a/modular_zubbers/code/game/turfs/open/sand.dm b/modular_zubbers/code/game/turfs/open/sand.dm
@@ -37,7 +37,6 @@
 	icon = 'modular_zubbers/icons/turf/lunar_rock.dmi'
 	icon_state = "0,0"
 	planetary_atmos = TRUE
-	baseturfs = /turf/open/misc/moonstation_rock //You have hit rock bottom.
 
 /turf/open/misc/moonstation_rock/break_tile()
 	. = ..()
@@ -61,7 +60,6 @@
 
 /turf/open/floor/catwalk_floor/rust/moonstation
 	initial_gas_mix = MOONSTATION_ATMOS
-	baseturfs = /turf/open/floor/plating/rust/moonstation
 	planetary_atmos = TRUE
 
 /turf/open/floor/iron/solarpanel/moonstation

diff --git a/...ntagonists/nightmare/nightmare_species.dm → ...ntagonists/nightmare/nightmare_species.dm b/...ntagonists/nightmare/nightmare_species.dm → ...ntagonists/nightmare/nightmare_species.dm
diff --git a/..._zubbers/modules/arcades/assets/arcade.dm → ...ers/code/modules/arcades/assets/arcade.dm b/..._zubbers/modules/arcades/assets/arcade.dm → ...ers/code/modules/arcades/assets/arcade.dm
diff --git a/...cades/code/loot/arcade_weights_classic.dm → ...cades/code/loot/arcade_weights_classic.dm b/...cades/code/loot/arcade_weights_classic.dm → ...cades/code/loot/arcade_weights_classic.dm
diff --git a/...es/code/loot/arcade_weights_mechanical.dm → ...es/code/loot/arcade_weights_mechanical.dm b/...es/code/loot/arcade_weights_mechanical.dm → ...es/code/loot/arcade_weights_mechanical.dm
diff --git a/...rcades/code/loot/arcade_weights_oh_god.dm → ...rcades/code/loot/arcade_weights_oh_god.dm b/...rcades/code/loot/arcade_weights_oh_god.dm → ...rcades/code/loot/arcade_weights_oh_god.dm
diff --git a/...cades/code/loot/arcade_weights_special.dm → ...cades/code/loot/arcade_weights_special.dm b/...cades/code/loot/arcade_weights_special.dm → ...cades/code/loot/arcade_weights_special.dm
diff --git a/...s/arcades/code/loot/arcade_weights_toy.dm → ...s/arcades/code/loot/arcade_weights_toy.dm b/...s/arcades/code/loot/arcade_weights_toy.dm → ...s/arcades/code/loot/arcade_weights_toy.dm
diff --git a/...s/arcades/code/minesweeper/minesweeper.dm → ...s/arcades/code/minesweeper/minesweeper.dm b/...s/arcades/code/minesweeper/minesweeper.dm → ...s/arcades/code/minesweeper/minesweeper.dm
diff --git a/...odules/arcades/code/overrides/spawners.dm → ...odules/arcades/code/overrides/spawners.dm b/...odules/arcades/code/overrides/spawners.dm → ...odules/arcades/code/overrides/spawners.dm
diff --git a/...odules/ashwalker_names/ashwalker_names.dm → ...ode/modules/ashwalkers/ashwalker_names.dm b/...odules/ashwalker_names/ashwalker_names.dm → ...ode/modules/ashwalkers/ashwalker_names.dm
diff --git a/...es/ashwalkers/code/effects/ash_rituals.dm → ...es/ashwalkers/code/effects/ash_rituals.dm b/...es/ashwalkers/code/effects/ash_rituals.dm → ...es/ashwalkers/code/effects/ash_rituals.dm
diff --git a/modular_zubbers/code/modules/automapper/code/area_spawn_entries.dm b/modular_zubbers/code/modules/automapper/code/area_spawn_entries.dm
@@ -1,3 +1,6 @@
 /datum/area_spawn/secmed_landmark
 	target_areas = list(/area/station/security/medical, /area/station/security/brig)
-	desired_atom = /obj/effect/landmark/start/security_medic
+	desired_atom = /obj/effect/landmark/start/security_medic
+
+/datum/area_spawn/lustwish_prison
+	desired_atom = /obj/machinery/vending/dorms/prison // PRISON LUSTWISH
diff --git a/...er/code/overrides/area_spawn_subsystem.dm → ...er/code/overrides/area_spawn_subsystem.dm b/...er/code/overrides/area_spawn_subsystem.dm → ...er/code/overrides/area_spawn_subsystem.dm
diff --git a/..._zubbers/modules/blooper/atoms_movable.dm → ...ers/code/modules/blooper/atoms_movable.dm b/..._zubbers/modules/blooper/atoms_movable.dm → ...ers/code/modules/blooper/atoms_movable.dm
diff --git a/modular_zubbers/modules/blooper/bark.dm → modular_zubbers/code/modules/blooper/bark.dm b/modular_zubbers/modules/blooper/bark.dm → modular_zubbers/code/modules/blooper/bark.dm