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

Ore Processing Framework #2766

Merged
merged 184 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
184 commits
Select commit Hold shift + click to select a range
0ad19e7
temp
dwasint Jul 29, 2024
f18d892
Update event.dm
dwasint Jul 29, 2024
6f48272
test
dwasint Jul 29, 2024
25140ea
updates some rulesets
dwasint Jul 29, 2024
b6670d1
Update client_procs.dm
dwasint Jul 30, 2024
ddfd14d
Update base.dm
dwasint Jul 30, 2024
d911d72
properly nulls phantoms
dwasint Jul 31, 2024
4a49ca0
smg tuning
dwasint Jul 31, 2024
2c3bae4
fixes
dwasint Aug 1, 2024
a070ba3
Update pirate_event.dm
wraith-54321 Aug 2, 2024
ca5cf3d
fixes maybe
dwasint Aug 3, 2024
4c97f5d
Update sound.dm
dwasint Aug 3, 2024
195cf2c
Update sound.dm
dwasint Aug 3, 2024
a9b3006
basics
dwasint Aug 8, 2024
e1bbe47
Update brine_chamber.dm
dwasint Aug 8, 2024
d2f475b
splitter
dwasint Aug 8, 2024
5e4302d
fixes
dwasint Aug 8, 2024
1d1d49b
stuff
dwasint Aug 8, 2024
8fe6ab7
lots of stuff
dwasint Aug 9, 2024
de53587
Update grabber.dm
dwasint Aug 9, 2024
a7ec43e
Update grabber.dm
dwasint Aug 9, 2024
938a49b
more stuff
dwasint Aug 10, 2024
e087c2a
more stuff
dwasint Aug 10, 2024
f5ac461
cleanup
dwasint Aug 10, 2024
ce61963
Update antibodyscanner.dm
dwasint Aug 10, 2024
6619fb3
:(
dwasint Aug 10, 2024
d75a8b0
reverts
dwasint Aug 10, 2024
93c654d
Update __spawning_component.dm
dwasint Aug 10, 2024
76371ec
debug
dwasint Aug 10, 2024
4b3e72e
Update datum.dm
dwasint Aug 10, 2024
49170ae
Update debug.dm
dwasint Aug 11, 2024
2dda596
Update debug.dm
dwasint Aug 11, 2024
91900ad
da
dwasint Aug 11, 2024
7d9a553
Update master.dm
dwasint Aug 11, 2024
d4bc374
Update debug.dm
dwasint Aug 11, 2024
c49b432
yea
dwasint Aug 11, 2024
5323aa4
Update button.dm
dwasint Aug 11, 2024
4b8b37c
start of filters
dwasint Aug 11, 2024
3465ab1
adds filter stuff
dwasint Aug 12, 2024
64e0f3b
Merge branch 'master' into mekanism
dwasint Aug 12, 2024
6331289
assembler base
dwasint Aug 12, 2024
d349b3f
Update assembler.dm
dwasint Aug 12, 2024
4015f3c
Update assembler.dm
dwasint Aug 12, 2024
5abe5e0
assembler fix
dwasint Aug 12, 2024
fedfdb2
adds examine for assembler
dwasint Aug 12, 2024
de95cad
qol stuff
dwasint Aug 12, 2024
1a1e688
molotovs are kinda wonky but everything else is fine
dwasint Aug 13, 2024
f4daad4
boulder thumpers
dwasint Aug 13, 2024
9f12ce0
the ore vents are real
dwasint Aug 13, 2024
df44540
some more stuff performance improvement by moving debug procs
dwasint Aug 13, 2024
43e53cf
fixes ore vents
dwasint Aug 13, 2024
8a315ae
what
dwasint Aug 13, 2024
1835815
oops
dwasint Aug 13, 2024
f7108a1
Update plague_rat.dm
dwasint Aug 14, 2024
8d9a2c6
fixes
dwasint Aug 14, 2024
e7e5394
Update chemical_injector.dm
dwasint Aug 14, 2024
b19bda9
Update ducts.dm
dwasint Aug 14, 2024
6b824ef
fixes
dwasint Aug 14, 2024
095e471
changes to reduce memory footpint
dwasint Aug 15, 2024
1ab325f
saves datums
dwasint Aug 15, 2024
c99c1dc
Update debug.dm
dwasint Aug 15, 2024
6fcd45f
fixes
dwasint Aug 15, 2024
39d3923
fixes
dwasint Aug 15, 2024
e7c8abf
Delete hypnagogicv3-1-0.exe
dwasint Aug 15, 2024
b1fbe28
fixes
dwasint Aug 15, 2024
17547ac
Merge branch 'master' into mekanism
dwasint Aug 15, 2024
ad668af
properlly adds the blueshield
dwasint Aug 15, 2024
b668702
whoops
dwasint Aug 15, 2024
7abfaf7
whoops 2
dwasint Aug 15, 2024
654a944
Update gun.dm
dwasint Aug 15, 2024
3351618
fixes
dwasint Aug 15, 2024
43daa0a
Update Blueshift.dmm
dwasint Aug 15, 2024
d502343
changes
dwasint Aug 16, 2024
7993b69
Update sleeping_carp.dm
dwasint Aug 16, 2024
740753d
fixes
dwasint Aug 16, 2024
a91d9de
Update _material.dm
dwasint Aug 16, 2024
bd9e8dc
revamps the drunkards liver to convert water to beer, as a byproduct …
dwasint Aug 16, 2024
a960a54
brewin of the brewin and chewing update
dwasint Aug 17, 2024
ddbd643
Update world.dm
dwasint Aug 17, 2024
a540603
fix
dwasint Aug 17, 2024
c4f12c1
Update patreon_data.dm
dwasint Aug 17, 2024
d0f5854
more stuff
dwasint Aug 18, 2024
bb648bd
Update StackCraft.js
dwasint Aug 18, 2024
ec7bec2
fixes
dwasint Aug 19, 2024
6f0541c
Update wardrobes.dm
dwasint Aug 19, 2024
e053d72
I hate tgui I hate tgui
dwasint Aug 19, 2024
3734ec2
some fixes to custom descs
dwasint Aug 19, 2024
940d188
fixes
dwasint Aug 19, 2024
e71433c
more stuff
dwasint Aug 20, 2024
fd211a3
Update other_reagents.dm
dwasint Aug 20, 2024
27aa086
test
dwasint Aug 20, 2024
32655d8
Update BoxStation.dmm
dwasint Aug 20, 2024
e324196
whoopsie
dwasint Aug 20, 2024
f5397ee
pain
dwasint Aug 20, 2024
fdcc69f
Update modified_reagents.dm
dwasint Aug 20, 2024
e464596
Merge branch 'master' into mekanism
dwasint Aug 20, 2024
69ac7a0
whoops
dwasint Aug 20, 2024
31b6e9a
adds readme and traits
dwasint Aug 20, 2024
acff3ec
Update opiods.dm
dwasint Aug 20, 2024
708fe44
Update _base.dm
dwasint Aug 20, 2024
da5d83d
Update disease_outbreak.dm
dwasint Aug 20, 2024
7b8dbbb
Update deforest.dm
dwasint Aug 20, 2024
7cec32b
Update traits.dm
dwasint Aug 20, 2024
e824063
halves robotic limb attachment pain
dwasint Aug 20, 2024
8c3ac0a
adds desc
dwasint Aug 20, 2024
62218ef
tweaks
dwasint Aug 20, 2024
c7aed4c
Update scream_for_me.dm
dwasint Aug 20, 2024
5966f54
Update _base.dm
dwasint Aug 20, 2024
5349c64
Update fortitude.dm
dwasint Aug 20, 2024
9f60541
fixes
dwasint Aug 20, 2024
836fe24
fixes
dwasint Aug 20, 2024
f264c99
fixes
dwasint Aug 20, 2024
dac28b3
Update custom.dm
dwasint Aug 20, 2024
993c81e
fixes
dwasint Aug 20, 2024
c4d749c
Update plague_rat.dm
dwasint Aug 20, 2024
904f701
more stuff
dwasint Aug 21, 2024
67bc67e
Update pain_items.dmi
dwasint Aug 21, 2024
e911b7e
fixes
dwasint Aug 21, 2024
0332456
more tweaks
dwasint Aug 21, 2024
3a0fa07
Update _actionspeed_modifier.dm
dwasint Aug 21, 2024
03391f4
wah
dwasint Aug 22, 2024
c2cd331
fixes for fryers
dwasint Aug 22, 2024
39c7dfd
stuff
dwasint Aug 22, 2024
0e0b748
more tweaks
dwasint Aug 22, 2024
f8db327
compresses steps
dwasint Aug 22, 2024
eb932c1
Update PersonalCrafting.tsx
dwasint Aug 22, 2024
a510c3f
hellish
dwasint Aug 22, 2024
a632d97
linters
dwasint Aug 22, 2024
628ae8c
Update holding_types.dm
dwasint Aug 22, 2024
85355e9
adds powerful painkillers to survival pens
dwasint Aug 22, 2024
d6d53fe
Update event.dm
dwasint Aug 22, 2024
3d07684
Update painkillers.dm
dwasint Aug 22, 2024
be89332
Update disease_outbreak.dm
dwasint Aug 22, 2024
dc114a6
changes
dwasint Aug 22, 2024
f37094a
Update debug.dm
dwasint Aug 23, 2024
e734567
more recipes
dwasint Aug 23, 2024
2b3b2a8
adds weapon pain damage
dwasint Aug 23, 2024
6689b94
whoops
dwasint Aug 23, 2024
7dd1b20
fixes
dwasint Aug 24, 2024
128344e
fixed
dwasint Aug 24, 2024
17bb159
Update mouse.dm
dwasint Aug 24, 2024
b90a0a5
ffs
dwasint Aug 24, 2024
a204555
base
dwasint Aug 25, 2024
76c5f1d
we ball
dwasint Aug 26, 2024
4b9ab65
Update particle.dm
dwasint Aug 26, 2024
c8a688b
fixed
dwasint Aug 26, 2024
b3881d4
Update _base.dm
dwasint Aug 26, 2024
65ae365
some pain feedback
dwasint Aug 27, 2024
4556661
some more visual stuff
dwasint Aug 27, 2024
ebc5a94
Update bullets.dm
dwasint Aug 27, 2024
5802d04
better recoil
dwasint Aug 27, 2024
aae03f2
start of slasher changes
dwasint Aug 30, 2024
4afc74a
Update assembler.dm
dwasint Sep 2, 2024
2f8d213
Update assembler.dm
dwasint Sep 2, 2024
62a512c
Update code_generator.dm
dwasint Sep 3, 2024
477aa29
moves slasher stuff to new lifes
dwasint Sep 4, 2024
516b07f
more stuff
dwasint Sep 4, 2024
b528d83
whoops
dwasint Sep 5, 2024
ced0a61
whoops
dwasint Sep 5, 2024
1619226
Revert "whoops"
dwasint Sep 5, 2024
348350a
Update gary_component.dm
dwasint Sep 5, 2024
dec86b6
Update stage4.dm
dwasint Sep 5, 2024
f487c10
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 7, 2024
f598821
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 8, 2024
bf96dba
Update declarations.dm
dwasint Sep 8, 2024
f39273a
fixes
dwasint Sep 8, 2024
245e3ce
Update _traits.dm
dwasint Sep 8, 2024
d161614
Update slasher_datum.dm
dwasint Sep 8, 2024
58305ff
Update scrap.dm
dwasint Sep 8, 2024
aa810e6
linters
dwasint Sep 8, 2024
482de15
Update species.dm
dwasint Sep 8, 2024
15c53d6
Update dismemberment.dm
dwasint Sep 8, 2024
e24b4e0
Update dismemberment.dm
dwasint Sep 8, 2024
0797270
Update deep_fryer.dm
dwasint Sep 8, 2024
9bfb8a1
Update deep_fryer.dm
dwasint Sep 8, 2024
cb0fd62
adds a new recipe step type reagent_choice
dwasint Sep 8, 2024
d9e07b7
Update add_reagent_choice.dm
dwasint Sep 8, 2024
86a55e3
fix mem stats flags
Absolucy Sep 8, 2024
098f954
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Sep 8, 2024
ca25173
Update console.dm
dwasint Sep 9, 2024
e4b478b
Merge branch 'mekanism' of https://github.com/dwasint/Monkestation2.0…
dwasint Sep 9, 2024
3186f8b
fixes title screens
dwasint Sep 9, 2024
a732632
more recipes
dwasint Sep 9, 2024
6d62f81
Update mapload_space_verification.dm
dwasint Sep 9, 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
  •  
  •  
  •  
27 changes: 27 additions & 0 deletions _maps/RandomRuins/IceRuins/icemoon_surface_ore_vent.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"l" = (
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters)
"L" = (
/obj/structure/ore_vent/random/icebox,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters)

(1,1,1) = {"
a
l
a
"}
(2,1,1) = {"
l
L
l
"}
(3,1,1) = {"
a
l
a
"}
27 changes: 27 additions & 0 deletions _maps/RandomRuins/IceRuins/icemoon_underground_ore_vent.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"l" = (
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored)
"L" = (
/obj/structure/ore_vent/random/icebox/lower,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored)

(1,1,1) = {"
a
l
a
"}
(2,1,1) = {"
l
L
l
"}
(3,1,1) = {"
a
l
a
"}
27 changes: 27 additions & 0 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_ore_vent.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"l" = (
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"L" = (
/obj/structure/ore_vent/random,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)

(1,1,1) = {"
a
l
a
"}
(2,1,1) = {"
l
L
l
"}
(3,1,1) = {"
a
l
a
"}
1 change: 1 addition & 0 deletions _maps/blueshift.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"map_name": "Blueshift",
"map_path": "map_files/Blueshift",
"map_file": "Blueshift.dmm",
"space_ruin_levels": 2,
"shuttles": {
"cargo": "cargo_nova",
"whiteship": "whiteship_blueshift",
Expand Down
Loading
Loading