A singular cooking recipe, and an overhaul of blood, temperature, and…

… pain. (#3301) * some more recipes and pref sanity * Update particle.dm * Update verbs.dm * Update preferences.dm * some ranching fixes * more tweaks * the medicalling * new stuff * non lethals tweak * Update all_nodes.dm * tasers * de-hardcodes sampler for blood_data * Update humans.dm * Fix this runtime that keeps getting spammed constantly * Update ethereal.dm * Update ethereal.dm * shit * Update fryer_overhaul.dm * should be async * async's etheral blood and makes secondary state respect combat mode * whoops * some od tweaks * tweakin * Update _traits.dm * changes * Update mobs.dm * Update species.dm * more fixes * more tweaks * Update mod_control.dm * Update cell.dm * Update cell.dm * more changes * ffs * Update _base.dm * testing change * Update health_analyzer.dm * nothing wrong here * pain pain go away * lowered organ damage * tweaks * adds crutches and temp packs to medical lathes * more ornthid tweaks * Update species.dm * Update species.dm * Update temperature_proc.dm * Update healing.dm * cryopod tweaks lung pop tweaks * fixes * whoopss * Update organs.dm * base linter fixes * whoops * Update stomach_ethereal.dm * redoes some things * better blood * fixes * fixes * fixes * Update pierce.dm * fixes * Update organs.dm * Update _base.dm * Update stacking_effect.dm * Update tongue.dm * more fixes * Update living_defense.dm * Update living_defense.dm * base nuking stuff * ethereal charge back to stomach * blood hearts and slime changes * silver lizard * tons of tweaks * Update species.dm * Update species.dm * Update species.dm * Update stomach_ethereal.dm * fixes * Update vampire.dm * fixes two * Update _tongue.dm * new giving component * web edits * Update inventory.dm * fixes * Update _base.dm * fix some simple runtimes * inverted * Update warden.dm Added sec time requirement to warden instead of 5 hours as crew * Update food_reagents.dm * fix * basic changes * Update _base.dm * Update particle.dm * adds support for arbitrary amounts of color zones on mutant overlays * Update fight_button.dm * some more changes * fixes * fixes * hunger changes * should work? * Update clockwork_cult.dm * Update living_procs.dm * Update species.dm * Create ATTRIBUTION.txt * Update credits_subsystem.dm * spacigs * Whoops * tweaks * stuff * Update _credits.dm * ggh * fixes * more stuff * Update _credits.dm * Update credits_subsystem.dm * wowie * Update _credits.dm * Update _credits.dm * Update _credits.dm * Update _credits.dm * changes * changes * removed banned members plushie * ad * teratoma fixes * adjustments * Update medicine_reagents.dm * common runtime fixes * converts to a config file * tweaks * pete * whoops * screams and laughs refactored * removes some un-needed code * fixes * whoops * Update golems.dm * Update sleeping_carp.dm * Update sleeping_carp.dm * Update medicine_reagents.dm * guh * Update stage3.dm * Update stage3.dm * fixes * guh * Update icemoon_surface_mining_site.dmm * Update deforest.dm * Update golems.dm * replaced * Update dummy.dm * Update golems.dm * lore section * fixes * Update internal_bleeding.dm * Update living_procs.dm * Update screenshot_humanoids__datum_species_ornithid.png * Update corgi.dm --------- Co-authored-by: Lucy <[email protected]> Co-authored-by: ThePooba <[email protected]>
Monkestation · Oct 10, 2024 · 880e06d · 880e06d
1 parent 0ec6b43
commit 880e06d
Show file tree

Hide file tree

Showing 662 changed files with 13,975 additions and 8,994 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,6 +1,13 @@
 {
 	"version": "0.2.0",
 	"configurations": [
+		{
+			"type": "opendream",
+			"request": "launch",
+			"name": "OpenDream",
+			"preLaunchTask": "OpenDream: compile ${command:CurrentDME}",
+			"json_path": "${workspaceFolder}/${command:CurrentJson}"
+		},
 		{
 			"type": "byond",
 			"request": "launch",

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
@@ -82,7 +82,6 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "s" = (
-/obj/effect/decal/cleanable/trail_holder,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "t" = (

diff --git a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
@@ -132,7 +132,7 @@
 /turf/open/floor/iron/smooth_edge,
 /area/ruin/space/has_grav/derelictsulaco)
 "eF" = (
-/obj/effect/decal/cleanable/blood/xtracks,
+/obj/effect/decal/cleanable/xenoblood/xtracks,
 /turf/open/floor/plating/airless,
 /area/ruin/space)
 "eU" = (
@@ -165,7 +165,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "fI" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -663,7 +663,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "vl" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -708,7 +708,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "wR" = (
 /obj/effect/mapping_helpers/burnt_floor,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1017,7 +1017,7 @@
 /area/ruin/space)
 "Ie" = (
 /obj/effect/mapping_helpers/burnt_floor,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1322,7 +1322,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "QR" = (
 /obj/structure/alien/weeds,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 5
 	},
 /obj/item/trash/flare,
@@ -1433,7 +1433,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "TL" = (
 /obj/structure/alien/weeds,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1645,7 +1645,7 @@
 /area/template_noop)
 "ZA" = (
 /obj/effect/mapping_helpers/broken_floor,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,

diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -3429,7 +3429,7 @@
 /obj/machinery/door/airlock/highsecurity,
 /obj/structure/alien/weeds,
 /obj/structure/cable,
-/obj/effect/decal/cleanable/blood/xtracks,
+/obj/effect/decal/cleanable/xenoblood/xtracks,
 /obj/effect/decal/cleanable/blood/tracks,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
 	cycle_id = "oldstation-aisat"
@@ -4613,7 +4613,7 @@
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hall)
 "rC" = (
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/glass,
@@ -4892,7 +4892,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/item/shard,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 6
 	},
 /obj/effect/turf_decal/tile/purple/half/contrasted,
@@ -7247,7 +7247,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/ancientstation/beta/supermatter)
 "Np" = (
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 10
 	},
 /turf/open/floor/engine,
@@ -8194,7 +8194,7 @@
 /turf/open/floor/engine,
 /area/ruin/space/ancientstation/delta/biolab)
 "Wd" = (
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 5
 	},
 /turf/open/floor/engine,