Commit Graph

329 Commits

Author SHA1 Message Date
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656
[MIRROR] Makes the deconstructable TEG working
2018-07-01 09:36:57 -05:00
Dennok
58f634db63 deconstructable-TEG (#38656)
Make TEG deconstructable.
2018-07-01 05:41:53 -05:00
Matt Smith
17d59060ad Add welded shut message to vent scrubber (#38834) 2018-07-01 05:41:43 -05:00
LetterJay
4177d3664b Merge pull request #7224 from Citadel-Station-13/upstream-merge-38650
[MIRROR] Removes unused undefs
2018-06-24 16:40:09 -05:00
CitadelStationBot
f02a99f901 [MIRROR] Fixes HE pipes not respecting layering (#7223)
* Fixes HE pipes not respecting layering (#38468)

* HE pipes fix

* Heat exchange stuff

* Fixes HE pipes not respecting layering
2018-06-22 00:16:50 -07:00
Jordan Brown
6e94511718 Removes unused defines (#38650) 2018-06-22 02:04:45 -05:00
LetterJay
c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496
[MIRROR] Fix being able to pull mirage borders, others
2018-06-18 10:09:20 -05:00
Jordan Brown
9acc97dabe Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders
Fix being able to pull mirage borders, others
2018-06-16 15:50:27 -05:00
cyclowns
a2f34faa55 [READY] [TESTED] Fusion Rework Episode V: The Phantom Fusion (#38329)
* initial iteration

* overlooks

* division -> multiplication

* less magic defines

* meant magic numbers, also BZ reqs -> N2O and plasma

* fusion now reacts to give higher temps

* iteration 2, thanks @Manybones

* small changes

* C O N S I S T E N C Y + more higher bigger temperatures

* testing shit and balance pass ignore this

* major balance pass, woohoo time for more TESTING

* whoops

* minor balancing

* radiation is more better

* desmos links..

* silly me

* more radiation buffs and remnants

* reverting a change i made at 2 am
2018-06-16 14:41:16 -05:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
deathride58
b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
81Denton
0d42b1c4d1 Replaces airlock_controller/incinerator related varedits with defines/subtypes 2018-06-03 11:03:14 -05:00
cyclowns
bd25d809c3 Fixes tritium and plasma fires storing cached_results incorrectly (#38230)
* id -> "fire"

* testing remnant
2018-06-03 09:03:33 -05:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay
69af2087aa Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
2018-05-27 01:32:02 -05:00
kevinz000
1b0a6b3bd7 Fixes digital valves not working for silicons (#37969)
* Update valve.dm

* Blah blah interaction flags
2018-05-22 22:12:14 -05:00
cyclowns
f37865ee6c Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.

tweak: Analyzers now show temperature in kelvin as well as celsius.

tweak: Analyzers now show total mole count, volume, and mole count of all gases.

tweak: Analyzers show everything at slightly higher degrees of precision.


More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
2018-05-22 22:11:23 -05:00
LetterJay
01fc8cf128 Merge pull request #6555 from Citadel-Station-13/upstream-merge-37293
[MIRROR] Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again
2018-05-22 07:17:41 -05:00
Jordan Brown
60b3384695 Merge pull request #37965 from AnturK/whatthecommentsays
Fixes fire_act working on deleted things.
2018-05-21 16:27:55 -05:00
LetterJay
39365437f5 Merge branch 'master' into upstream-merge-37293 2018-05-21 08:53:17 -05:00
cyclowns
7cc9d9103d Refactors hydrocarbon combustion + other general atmos code changes (#37600)
* splits hydrocarbon combustion + other stuff

* nob max() thing

* whoops

* remove proc + new define
2018-05-21 03:21:08 -05:00
81Denton
0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
LetterJay
80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
Naksu
eb4743e5a9 every fucking time 2018-05-08 09:21:36 -05:00
deathride58
bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380
[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
oranges
187f27983c Merge pull request #37535 from cyclowns/fusion-fix
Fixes gas fusion power not being taken into account
2018-04-29 17:18:30 -05:00
as334
9b36d6c4d9 Re-adds and reworks fusion. (#37384)
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 01:01:47 -05:00
pigeons
2b2ff05b73 Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again 2018-04-27 20:28:55 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
deathride58
909be55c5f Merge pull request #6497 from Citadel-Station-13/upstream-merge-37341
[MIRROR] Adds multilayer pipe subtypes for mapping
2018-04-27 09:29:04 +00:00
81Denton
8fdc520031 Adds multilayer pipe subtypes for mapping (#37341)
* adds multilayer pipe subtypes for mapping

* replaces values with defines
2018-04-23 10:33:20 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
pigeons
4d0597ad5b Parenthesizes some macros (#37212)
* parenthesizes some macros

* A couple more macro definition parenthesizing
2018-04-16 03:47:46 -05:00
vuonojenmustaturska
472e7f7f61 Allows passive gates to be touched in unpowered areas 2018-04-15 12:41:28 -05:00
deathride58
ba276cf374 Merge pull request #6373 from Citadel-Station-13/upstream-merge-37116
[MIRROR] Fixes order of operations math errors with gas defines.
2018-04-11 21:26:47 +00:00
The_Dreamweaver
adac58f0c2 Fixes order of operations math errors with gas defines. 2018-04-11 15:02:22 -05:00
vuonojenmustaturska
d559fc1bd3 remove 512 version checks 2018-04-11 14:26:41 -05:00
deathride58
5f81921fa6 Merge branch 'master' into synctesting 2018-04-08 03:41:50 +00:00
CitadelStationBot
43baad50f1 [MIRROR] Add on-map sprites for pre-enabled atmos pumps (#6300)
* Add on-map sprites for pre-enabled atmos pumps

* Update volume_pump.dm

* Update pump.dm
2018-04-07 22:38:32 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Jordan Brown
5b2df864e3 Merge pull request #36899 from vuonojenmustaturska/quantumsolace
Fixes an edge case with atmos gas mixture garbage collection
2018-04-02 08:31:11 -05:00
LetterJay
cccab00fed Merge pull request #6134 from Citadel-Station-13/upstream-merge-36230
[MIRROR] Pipenet fix
2018-04-01 01:01:42 -05:00
Jordan Brown
d47686c88e Removes empty New() 2018-03-31 09:11:04 -05:00
Robustin
ff3818aa86 Gas react is much more efficient (#36667)
* React but with some conditions first

* Update gas_types.dm

* Webeditor maymay

* This might break fire but isn't that what freezes are for?

* More webeditor memes

* Did that madman just make it even FASTER?

* Changing list to typecache

* Gotta go faster

* review, dnm yet

* gas.len instead of volume

* Dunc the redeemed

* Merge ready

* Dunc's method actually wasnt the best
2018-03-28 12:16:15 -05:00