Skip to content

Commit

Permalink
Ore Processing Framework (#2766)
Browse files Browse the repository at this point in the history
* temp

* Update event.dm

* test

* updates some rulesets

* Update client_procs.dm

* Update base.dm

* properly nulls phantoms

* smg tuning

* fixes

* Update pirate_event.dm

* fixes maybe

* Update sound.dm

* Update sound.dm

* basics

* Update brine_chamber.dm

* splitter

* fixes

* stuff

* lots of stuff

* Update grabber.dm

* Update grabber.dm

* more stuff

* more stuff

* cleanup

* Update antibodyscanner.dm

* :(

* reverts

* Update __spawning_component.dm

* debug

* Update datum.dm

* Update debug.dm

* Update debug.dm

* da

* Update master.dm

* Update debug.dm

* yea

* Update button.dm

* start of filters

* adds filter stuff

* assembler base

* Update assembler.dm

* Update assembler.dm

* assembler fix

* adds examine for assembler

* qol stuff

* molotovs are kinda wonky but everything else is fine

* boulder thumpers

* the ore vents are real

* some more stuff performance improvement by moving debug procs

* fixes ore vents

* what

* oops

* Update plague_rat.dm

* fixes

* Update chemical_injector.dm

* Update ducts.dm

* fixes

* changes to reduce memory footpint

* saves datums

* Update debug.dm

* fixes

* fixes

* Delete hypnagogicv3-1-0.exe

* fixes

* properlly adds the blueshield

* whoops

* whoops 2

* Update gun.dm

* fixes

* Update Blueshift.dmm

* changes

* Update sleeping_carp.dm

* fixes

* Update _material.dm

* revamps the drunkards liver to convert water to beer, as a byproduct makes the code nicer

* brewin of the brewin and chewing update

* Update world.dm

* fix

* Update patreon_data.dm

* more stuff

* Update StackCraft.js

* fixes

* Update wardrobes.dm

* I hate tgui I hate tgui

* some fixes to custom descs

* fixes

* more stuff

* Update other_reagents.dm

* test

* Update BoxStation.dmm

* whoopsie

* pain

* Update modified_reagents.dm

* whoops

* adds readme and traits

* Update opiods.dm

* Update _base.dm

* Update disease_outbreak.dm

* Update deforest.dm

* Update traits.dm

* halves robotic limb attachment pain

* adds desc

* tweaks

* Update scream_for_me.dm

* Update _base.dm

* Update fortitude.dm

* fixes

* fixes

* fixes

* Update custom.dm

* fixes

* Update plague_rat.dm

* more stuff

* Update pain_items.dmi

* fixes

* more tweaks

* Update _actionspeed_modifier.dm

* wah

* fixes for fryers

* stuff

* more tweaks

* compresses steps

* Update PersonalCrafting.tsx

* hellish

* linters

* Update holding_types.dm

* adds powerful painkillers to survival pens

* Update event.dm

* Update painkillers.dm

* Update disease_outbreak.dm

* changes

* Update debug.dm

* more recipes

* adds weapon pain damage

* whoops

* fixes

* fixed

* Update mouse.dm

* ffs

* base

* we ball

* Update particle.dm

* fixed

* Update _base.dm

* some pain feedback

* some more visual stuff

* Update bullets.dm

* better recoil

* start of slasher changes

* Update assembler.dm

* Update assembler.dm

* Update code_generator.dm

* moves slasher stuff to new lifes

* more stuff

* whoops

* whoops

* Revert "whoops"

This reverts commit ced0a61.

* Update gary_component.dm

* Update stage4.dm

* Update declarations.dm

* fixes

* Update _traits.dm

* Update slasher_datum.dm

* Update scrap.dm

* linters

* Update species.dm

* Update dismemberment.dm

* Update dismemberment.dm

* Update deep_fryer.dm

* Update deep_fryer.dm

* adds a new recipe step type reagent_choice

* Update add_reagent_choice.dm

* fix mem stats flags

* Update console.dm

* fixes title screens

* more recipes

* Update mapload_space_verification.dm

---------

Co-authored-by: wraith-54321 <[email protected]>
Co-authored-by: Lucy <[email protected]>
  • Loading branch information
3 people authored Sep 9, 2024
1 parent 6cf78f6 commit 5a14bc9
Show file tree
Hide file tree
Showing 440 changed files with 23,362 additions and 6,193 deletions.
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

0 comments on commit 5a14bc9

Please sign in to comment.