deathride58
b4321a1dbe
Merge pull request #4435 from Citadel-Station-13/upstream-merge-33636
...
[MIRROR] restores reaction max_reqs checking code
2017-12-21 03:44:57 +00:00
deathride58
59947b4b3b
Merge pull request #4424 from Citadel-Station-13/upstream-merge-33632
...
[MIRROR] properly disables fusion
2017-12-21 03:43:30 +00: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
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
Jordan Brown
50bd078b43
Merge pull request #33636 from duncathan/max_reqs
...
restores reaction max_reqs checking code
2017-12-18 15:15:09 -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
duncathan salt
3d375e0be9
properly disables fusion ( #33632 )
2017-12-17 14:37:58 -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
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
Jordan Brown
7a90baa1f8
Merge pull request #33390 from duncathan/atmos-defines
...
cleans up atmos defines
2017-12-09 15:53:34 -06:00
deathride58
2275d59305
Merge pull request #4276 from Citadel-Station-13/upstream-merge-33359
...
[MIRROR] Fixes air alarm gas thresholds being impossible to change
2017-12-08 18:46:33 +00:00
ACCount
7aac99d4d7
Fixes air alarm gas thresholds being impossible to change ( #33359 )
2017-12-08 12:08:24 -06:00
duncathan salt
623a105169
hopefully optimizes process_cell() a touch ( #33329 )
...
* hopeful optimizations + code cleanup to process_cell() and lindaturftile
* minor fixes
* break and right paren
* extraneous define
2017-12-08 12:07:14 -06:00
ACCount
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
ACCount
d883ec3114
Moves pipe meter sprites ( #33122 )
2017-11-28 06:28:31 -06:00
kevinz000
606f403c5b
Fixes cryo rotation ( #32992 )
2017-11-25 13:27:38 -06:00
deathride58
14ce7c8118
Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
...
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -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
LetterJay
30394c5da5
Merge branch 'master' into upstream-merge-32757
2017-11-15 13:01:55 -06:00
Emmett Gaines
ab21f8d5ed
511 client fix and a config to make the version warning a popup
2017-11-15 04:39:36 -06:00
Emmett Gaines
9b75113631
[512] Makes gas mouse transparent ( #32569 )
...
* Makes gas mouse transparent
* readability cleanup
* future proofing
2017-11-14 17:47:01 -06:00
LetterJay
44d15b07fb
Merge pull request #3942 from Citadel-Station-13/upstream-merge-32607
...
[MIRROR] Alt clicking additions
2017-11-14 15:57:06 -06:00
AutomaticFrenzy
b9c9b87441
Alt clicking additions ( #32607 )
...
Adds alt clicking to lock/unlock for apc and air alarm
2017-11-14 13:49:32 -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
as334
7f9800e8fa
Assmos tweaks/minor additions. ( #32400 )
...
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.
* Review response.
* tanks now melt above 1 Million degrees Kelvin.
2017-11-10 01:31:16 -06:00
ACCount
ab7e8a96a3
Increased gas filter UI size ( #32402 )
2017-11-05 02:08:43 -06:00
LetterJay
4bf6f81fd9
Merge pull request #3793 from Citadel-Station-13/upstream-merge-32362
...
[MIRROR] Improves hotspot code
2017-11-04 22:48:34 -05:00
Leo
5ca11c1db3
Merge pull request #32362 from tgstation/Cyberboss-patch-2
...
Improves hotspot code
2017-11-03 17:39:30 -05:00
oranges
1c60983624
Merge pull request #32338 from AnturK/hotspotfix
...
Fixes hotspot runtime
2017-11-03 15:54:02 -05:00
LetterJay
33d861608a
Merge pull request #3771 from Citadel-Station-13/upstream-merge-32219
...
[MIRROR] Adds new canister sprites
2017-11-03 00:16:08 -05:00
nicbn
065957c0e5
Adds new canister sprites ( #32219 )
...
* Gas rename
* and this
* and the comments
* nonitrous
* reverts ren
* really reverts it
* reverts some whitespace
* Update airalarm.dm
* Update canister.dm
* come on travis recompile
2017-11-02 15:01:54 -05:00
AnturK
b2e37c8799
Fixes atmos.
2017-11-02 11:46:14 -05:00
CitadelStationBot
429961fcea
Merge pull request #3741 from Citadel-Station-13/upstream-merge-32271
...
[MIRROR] Rename brown gas to nitryl
2017-11-02 04:07:48 -05:00
nicbn
8aef4f3b57
Rename brown gas to nitryl ( #32271 )
2017-11-01 21:37:20 -05:00
Emmett Gaines
a9f07518a7
Shuttle rotation refactor and significant performance upgrade
2017-10-31 20:23:57 -05:00
