Commit Graph

123 Commits

Author SHA1 Message Date
CitadelStationBot b3266870a6 [MIRROR] Fixes some tool interactions (#5555)
* Merge pull request #35724 from DaxDupont/bordlisten-loves-the-cocks

Fixes some tool interactions

* Fixes some tool interactions
2018-02-17 17:46:46 -06:00
Jordan Brown f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
BordListian 9b910552fd Forces gases to obey certain laws of nature (#35277)
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
2018-02-07 02:32:31 -06:00
Jordan Brown f0b02fac56 Merge pull request #34501 from AutomaticFrenzy/patch/mapping-scrubbers
Allow mapping non-default scrubbers
2018-01-19 09:38:04 -06:00
deathride58 85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
ShizCalev 7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
deathride58 0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
LetterJay 35574263b1 Update outlet_injector.dm 2017-12-30 13:23:02 -06:00
LetterJay 70fea88a39 Update cryo.dm 2017-12-30 13:22:54 -06:00
LetterJay 95714a0207 Update volume_pump.dm 2017-12-30 13:22:46 -06:00
YPOQ a41a508475 Fixes air alarm contaminated mode (#33899)
* Fixes air alarm contaminated mode

* set_filters, paths instead of ids

* Readds gasid2path call
2017-12-29 02:57:42 -06:00
oranges d960c45e77 Merge pull request #33622 from duncathan/assert_gas
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-20 00:14:13 -06:00
duncathan salt 0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
LetterJay 28dfbc7ccc Update volume_pump.dm 2017-12-17 15:57:46 -06:00
LetterJay 2771fe55e4 Update pump.dm 2017-12-17 15:57:33 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
ACCount 435e46e407 Moves some machine sprites into /machines/ folder 2017-12-05 03:24:03 -06:00
kevinz000 606f403c5b Fixes cryo rotation (#32992) 2017-11-25 13:27:38 -06:00
ShizCalev 12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
deathride58 ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05:00
Jordan Brown 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58 a8783e5d1f Merge branch 'master' into upstream-merge-32823 2017-11-18 06:06:14 +00:00
deathride58 5f055aa492 Update vent_scrubber.dm 2017-11-18 00:36:11 -05:00
deathride58 d034e7dbf2 Merge pull request #3964 from Citadel-Station-13/upstream-merge-32746
[MIRROR] Atmos Filter/Scrubber UI update
2017-11-18 05:35:27 +00:00
duncathan salt 8bc84c23db fixes scrubbers being unable to scrub 2017-11-17 12:50:42 -06:00
duncathan salt 043e689108 Atmos Filter/Scrubber UI update 2017-11-15 21:38:57 -06:00
ike709 1babecaf3c New vent and scrubber sprites (#32742)
* New vent and scrubber sprites

* Readds OFF and siphon arrow to map sprites
2017-11-15 19:09:21 -06:00
Jalleo 23983c48bf Old debug objects which one has been replaced and another nobody needs at the moment. Also removal of comments that I forgot to removal at _machinery.dm (#32685) 2017-11-14 05:01:25 -06:00
LetterJay bc23305ef9 Merge pull request #3907 from Citadel-Station-13/upstream-merge-32613
[MIRROR]  Fixes cryo overlay system
2017-11-13 11:50:23 -06:00
nicbn 9ac530dac9 Fixes cryo overlay system (#32613)
* Fixes cryo overlay system

* oops
2017-11-12 19:28:14 -06:00
Jalleo 300c471da9 Refactor of base machinery a tiny bit more. DONE (#32546)
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.

* Just checking something

* Does this fix the compiling not working properly?

* And this?

* What is going wrong ugh!

* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?

* Slight tidying up for what Cyberboss and Antur likes.

* Fixes the things that I was asked to fix
2017-11-12 13:19:23 -06:00
ACCount ab7e8a96a3 Increased gas filter UI size (#32402) 2017-11-05 02:08:43 -06:00
nicbn 8aef4f3b57 Rename brown gas to nitryl (#32271) 2017-11-01 21:37:20 -05:00
LetterJay 141de52658 Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
[MIRROR] Assmos part 1, #2
2017-10-27 02:47:56 -04:00
LetterJay 4facc9c04e Update pump.dm 2017-10-27 00:23:13 -05:00
LetterJay 2b699d8d73 Update volume_pump.dm 2017-10-27 00:05:28 -05:00
as334 eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
duncathan salt ed12370a73 Atmos construction rework again 2017-10-23 16:29:53 -05:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot a7a5679ef9 [MIRROR] Fixes #31897 , cryo base disappearing (#3534)
* Fixes #31897 , cryo base disappearing (#31909)

* Fixes cryo base disappearing

* code fix instead of icon fix, adds failure feedback to cells

* Fixes #31897 , cryo base disappearing
2017-10-21 03:46:17 -05:00
duncathan salt 09330f079a Filters allow air to pass through when not set to filter any gas (#31831)
* filters ignore air2 pressure if not filtering anything

* filter air2 being limited does not stop movement from air1 to air3
2017-10-18 02:00:16 -05:00
kevinz000 a41725a955 Atmospherics Multilayer Pipes (#30972)
* 1

* rpd

* 3

* 4

* 5

* 6

* 7

* 8

* wew

* src. and underlays

* update

* woops

* misspelled params

* reviews

* fixes

* fixes

* better checks and layer crap

* Update RPD.dm

* Update pipe_construction.dm

* 3 layers, fixes

* woops i didn't update defines correctly

* dunc

* Fixes

* Fixes

* fixes

* fixes some more bullshit

* fixes

* fixes

* not needed

* makes attachment sprites prettier or uglier i dunno

* Unary flag

* sprite fix??

* fixes...

* sprite fixes
2017-10-17 00:49:12 -05:00
LetterJay a1187795dd Merge pull request #3405 from Citadel-Station-13/upstream-merge-31692
[MIRROR] allows vent internal pressure bound to be set by air alarms
2017-10-15 10:23:26 -04:00
LetterJay 8f97e8c65f Merge pull request #3398 from Citadel-Station-13/upstream-merge-31688
[MIRROR] fixes filter NaN issue
2017-10-15 10:21:46 -04:00
oranges 993cf948fb allows vent internal pressure bound to be set by air alarms 2017-10-14 21:10:47 -05:00
Jordan Brown 6b7fce369b Merge pull request #31688 from duncathan/atmos-patch3
fixes filter NaN issue
2017-10-14 18:46:01 -05:00