Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A singular cooking recipe, and an overhaul of blood, temperature, and pain. #3301

Open
wants to merge 156 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
18d5630
some more recipes and pref sanity
dwasint Sep 10, 2024
61b4401
Update particle.dm
dwasint Sep 10, 2024
f9941c7
Update verbs.dm
dwasint Sep 10, 2024
ad475d6
Update preferences.dm
dwasint Sep 10, 2024
88bc5bc
some ranching fixes
dwasint Sep 10, 2024
4d4a6ef
more tweaks
dwasint Sep 10, 2024
9296871
the medicalling
dwasint Sep 10, 2024
d77a736
new stuff
dwasint Sep 11, 2024
0791500
non lethals tweak
dwasint Sep 11, 2024
6cac0c8
Update all_nodes.dm
dwasint Sep 11, 2024
4872f1b
tasers
dwasint Sep 11, 2024
007773a
de-hardcodes sampler for blood_data
dwasint Sep 11, 2024
bbb334e
Update humans.dm
dwasint Sep 11, 2024
f88c230
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 11, 2024
f57cf05
Fix this runtime that keeps getting spammed constantly
Absolucy Sep 11, 2024
d4e9b6e
Update ethereal.dm
dwasint Sep 11, 2024
8b5cb6f
Update ethereal.dm
dwasint Sep 11, 2024
c7dc3ea
shit
dwasint Sep 11, 2024
ef309f0
Update fryer_overhaul.dm
dwasint Sep 11, 2024
051213e
should be async
dwasint Sep 11, 2024
7ce76ec
async's etheral blood and makes secondary state respect combat mode
dwasint Sep 11, 2024
caf6d0e
whoops
dwasint Sep 11, 2024
11cae3e
some od tweaks
dwasint Sep 12, 2024
74bf6db
tweakin
dwasint Sep 12, 2024
aca4c30
Update _traits.dm
dwasint Sep 12, 2024
5ebcaee
changes
dwasint Sep 12, 2024
351e798
Update mobs.dm
dwasint Sep 12, 2024
7acbbd2
Update species.dm
dwasint Sep 12, 2024
9bc08eb
more fixes
dwasint Sep 12, 2024
c2a54be
more tweaks
dwasint Sep 12, 2024
554fbfe
Update mod_control.dm
dwasint Sep 12, 2024
d13df60
Update cell.dm
dwasint Sep 12, 2024
0b99e9f
Update cell.dm
dwasint Sep 12, 2024
af24a28
more changes
dwasint Sep 12, 2024
f07d397
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 13, 2024
9960783
ffs
dwasint Sep 13, 2024
c6d02ba
Merge branch 'recipes-galore' of https://github.com/dwasint/Monkestat…
dwasint Sep 13, 2024
a3288b8
Update _base.dm
dwasint Sep 13, 2024
5d3f946
testing change
dwasint Sep 13, 2024
c42196a
Update health_analyzer.dm
dwasint Sep 13, 2024
c346111
nothing wrong here
dwasint Sep 13, 2024
ced6cb3
Merge branch 'master' into recipes-galore
dwasint Sep 13, 2024
2a9f41d
pain pain go away
dwasint Sep 13, 2024
20a4588
Merge branch 'recipes-galore' of https://github.com/dwasint/Monkestat…
dwasint Sep 13, 2024
ae08476
lowered organ damage
dwasint Sep 13, 2024
14a2f0c
tweaks
dwasint Sep 13, 2024
d20b100
adds crutches and temp packs to medical lathes
dwasint Sep 14, 2024
ea6e9c9
more ornthid tweaks
dwasint Sep 14, 2024
a6f47f8
Update species.dm
dwasint Sep 14, 2024
fc5a665
Update species.dm
dwasint Sep 14, 2024
7ffd5b0
Update temperature_proc.dm
dwasint Sep 14, 2024
3d27f1c
Update healing.dm
dwasint Sep 14, 2024
f4f3857
cryopod tweaks lung pop tweaks
dwasint Sep 14, 2024
b471098
fixes
dwasint Sep 14, 2024
5d6f16a
whoopss
dwasint Sep 14, 2024
4154ec5
Update organs.dm
dwasint Sep 14, 2024
ea5fdf6
base linter fixes
dwasint Sep 14, 2024
919d2b6
whoops
dwasint Sep 14, 2024
39adaa9
Update stomach_ethereal.dm
dwasint Sep 14, 2024
c0994f8
redoes some things
dwasint Sep 15, 2024
47871e5
better blood
dwasint Sep 15, 2024
9631e35
fixes
dwasint Sep 15, 2024
e8b4edf
fixes
dwasint Sep 15, 2024
f108ce0
fixes
dwasint Sep 15, 2024
73cbb93
Update pierce.dm
dwasint Sep 15, 2024
df7e903
fixes
dwasint Sep 15, 2024
0dab1f0
Update organs.dm
dwasint Sep 15, 2024
deb2111
Update _base.dm
dwasint Sep 16, 2024
39e98ae
Update stacking_effect.dm
dwasint Sep 16, 2024
a07a699
Update tongue.dm
dwasint Sep 16, 2024
4813ecb
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 16, 2024
7bd4114
more fixes
dwasint Sep 16, 2024
6f3a163
Update living_defense.dm
dwasint Sep 16, 2024
ad30319
Update living_defense.dm
dwasint Sep 16, 2024
32f0b61
base nuking stuff
dwasint Sep 17, 2024
60f2bc6
ethereal charge back to stomach
dwasint Sep 17, 2024
95b3be8
blood hearts and slime changes
dwasint Sep 17, 2024
ff80bdf
silver lizard
dwasint Sep 17, 2024
87c09d9
tons of tweaks
dwasint Sep 17, 2024
64b5a79
Update species.dm
dwasint Sep 17, 2024
abf4c89
Update species.dm
dwasint Sep 17, 2024
31139f0
Update species.dm
dwasint Sep 17, 2024
2de04af
Update stomach_ethereal.dm
dwasint Sep 18, 2024
8fccd7f
fixes
dwasint Sep 18, 2024
fe0e535
Update vampire.dm
dwasint Sep 18, 2024
f29e6a7
fixes two
dwasint Sep 18, 2024
74e56e8
Update _tongue.dm
dwasint Sep 18, 2024
8fdfbc9
new giving component
dwasint Sep 18, 2024
ff09ae8
Merge branch 'master' into recipes-galore
dwasint Sep 18, 2024
e3d72f5
web edits
dwasint Sep 18, 2024
1f25f01
Update inventory.dm
dwasint Sep 18, 2024
d950ae1
fixes
dwasint Sep 18, 2024
220da36
Update _base.dm
dwasint Sep 18, 2024
4ec45ca
fix some simple runtimes
Absolucy Sep 19, 2024
cd3c217
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 19, 2024
68bba7a
inverted
dwasint Sep 19, 2024
92f8dc4
Merge branch 'recipes-galore' of https://github.com/dwasint/Monkestat…
dwasint Sep 19, 2024
96b5bbf
Update warden.dm
ThePooba Sep 19, 2024
c206de1
Update food_reagents.dm
dwasint Sep 19, 2024
1dd23a2
Merge branch 'recipes-galore' of https://github.com/dwasint/Monkestat…
dwasint Sep 19, 2024
4ed82e6
fix
dwasint Sep 20, 2024
ab5dad1
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 20, 2024
a284420
basic changes
dwasint Sep 20, 2024
15b1f8e
Merge branch 'recipes-galore' of https://github.com/dwasint/Monkestat…
dwasint Sep 20, 2024
ba37b48
Update _base.dm
dwasint Sep 21, 2024
bd4a48e
Update particle.dm
dwasint Sep 21, 2024
d7f1049
adds support for arbitrary amounts of color zones on mutant overlays
dwasint Sep 21, 2024
538a659
Update fight_button.dm
dwasint Sep 21, 2024
34d1c30
some more changes
dwasint Sep 21, 2024
eeb9c6f
fixes
dwasint Sep 21, 2024
766e67d
fixes
dwasint Sep 22, 2024
3171571
hunger changes
dwasint Sep 22, 2024
a0848aa
should work?
dwasint Sep 22, 2024
69c8e40
Update clockwork_cult.dm
dwasint Sep 22, 2024
a7d08fd
Update living_procs.dm
dwasint Sep 22, 2024
0df849e
Update species.dm
dwasint Sep 22, 2024
d2d81f3
Create ATTRIBUTION.txt
dwasint Sep 22, 2024
3c575ef
Update credits_subsystem.dm
dwasint Sep 22, 2024
d993f89
spacigs
dwasint Sep 22, 2024
a37424c
Whoops
dwasint Sep 22, 2024
59e018e
tweaks
dwasint Sep 22, 2024
11d7e81
stuff
dwasint Sep 22, 2024
33d656e
Update _credits.dm
dwasint Sep 22, 2024
fd3508a
ggh
dwasint Sep 22, 2024
61cbe4a
fixes
dwasint Sep 22, 2024
bf10c46
more stuff
dwasint Sep 22, 2024
7aaba48
Update _credits.dm
dwasint Sep 22, 2024
ecac25f
Update credits_subsystem.dm
dwasint Sep 22, 2024
f63f631
wowie
dwasint Sep 22, 2024
597e93c
Update _credits.dm
dwasint Sep 22, 2024
da9afaf
Update _credits.dm
dwasint Sep 23, 2024
3695417
Update _credits.dm
dwasint Sep 23, 2024
63c7842
Update _credits.dm
dwasint Sep 23, 2024
1ff9bfb
changes
dwasint Sep 24, 2024
ac99b53
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 24, 2024
750907d
changes
dwasint Sep 24, 2024
331d736
Merge branch 'recipes-galore' of https://github.com/dwasint/Monkestat…
dwasint Sep 24, 2024
330f755
removed banned members plushie
dwasint Sep 25, 2024
d3465a2
ad
dwasint Sep 25, 2024
a0c352c
Merge branch 'master' into recipes-galore
dwasint Sep 26, 2024
23be41d
teratoma fixes
dwasint Sep 26, 2024
0f79321
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 26, 2024
2d74a79
adjustments
dwasint Sep 27, 2024
c87b813
Update medicine_reagents.dm
dwasint Sep 28, 2024
9ea7fcf
common runtime fixes
dwasint Sep 28, 2024
fe248c5
converts to a config file
dwasint Sep 28, 2024
f8acedf
tweaks
dwasint Sep 28, 2024
5cedc3c
pete
dwasint Sep 28, 2024
2ed6dd9
whoops
dwasint Sep 28, 2024
f8e1201
screams and laughs refactored
dwasint Sep 28, 2024
c086a87
removes some un-needed code
dwasint Sep 28, 2024
00c312b
fixes
dwasint Sep 29, 2024
92018c3
whoops
dwasint Sep 29, 2024
146cdf5
Update golems.dm
dwasint Sep 29, 2024
33547a6
Update sleeping_carp.dm
dwasint Sep 29, 2024
4c5c945
Update sleeping_carp.dm
dwasint Sep 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
67 changes: 35 additions & 32 deletions _maps/map_files/Blueshift/Blueshift.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8388,12 +8388,6 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/port/upper)
"bFJ" = (
/obj/machinery/newscaster/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/executive,
/area/station/command/heads_quarters/blueshield)
"bFO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -30515,30 +30509,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"fRD" = (
/obj/structure/table/reinforced,
/obj/item/clothing/mask/gas/sechailer{
pixel_x = -3;
pixel_y = 3
},
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/mask/gas/sechailer{
pixel_x = 3;
pixel_y = -3
},
/obj/item/flashlight/seclite,
/obj/item/flashlight/seclite,
/obj/item/flashlight/seclite,
/obj/item/key/security,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/red/line{
dir = 4
},
/obj/effect/turf_decal/trimline/red/line{
dir = 8
},
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"fRF" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 10
Expand Down Expand Up @@ -44263,6 +44233,12 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/station/cargo/storage)
"iBK" = (
/obj/machinery/newscaster/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/executive,
/area/station/command/heads_quarters/blueshield)
"iBL" = (
/obj/machinery/announcement_system,
/turf/open/floor/iron/dark,
Expand Down Expand Up @@ -94617,6 +94593,33 @@
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/station/maintenance/department/security/lesser)
"ssL" = (
/obj/structure/table/reinforced,
/obj/item/clothing/mask/gas/sechailer{
pixel_x = -3;
pixel_y = 3
},
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/mask/gas/sechailer{
pixel_x = 3;
pixel_y = -3
},
/obj/item/flashlight/seclite,
/obj/item/flashlight/seclite,
/obj/item/flashlight/seclite,
/obj/item/key/security,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/red/line{
dir = 4
},
/obj/effect/turf_decal/trimline/red/line{
dir = 8
},
/obj/item/gun/energy/taser,
/obj/item/gun/energy/taser,
/obj/item/gun/energy/taser,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"ssN" = (
/obj/structure/mirror/directional/west,
/obj/effect/landmark/start/clown,
Expand Down Expand Up @@ -159457,7 +159460,7 @@ xJn
bqj
pzw
mrb
fRD
ssL
uKW
gkm
bkG
Expand Down Expand Up @@ -216025,7 +216028,7 @@ aXo
qXv
cFf
sZp
bFJ
iBK
sNk
rZk
sZp
Expand Down
Loading
Loading