shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,905 Commits 5 Branches 0 Tags
13ebff97df7f94ffb0f386dccebb68bc3c8b4fbe
Commit Graph

191 Commits

Author SHA1 Message Date
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
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
CitadelStationBot
46a78bc3dd [MIRROR] Reverts bluespace pipes (#3513) 
* Revert bluespace pipes while keeping fixes from the original PR (#31866)

These are absurdely overpowered given that they have no research or
material gate

* Reverts bluespace pipes
 2017-10-20 01:40:15 -05:00
LetterJay
94c6a859bf Merge pull request #3495 from Citadel-Station-13/upstream-merge-31859 
[MIRROR] Fixes an edge case in portable atmos connection check
 2017-10-19 09:11:37 -04:00
LetterJay
8f51e048e9 Merge pull request #3493 from Citadel-Station-13/upstream-merge-31853 
[MIRROR] fixes handbuilt gas meters
 2017-10-19 09:09:07 -04:00
duncathan salt
c03f112f9b fixes kevinz's silly mistake (#31859) 2017-10-19 01:42:45 -05:00
duncathan salt
bcf187465a fixes handbuilt gas meters (#31853) 2017-10-18 22:02:55 -05:00
Leo
371857cc35 Merge pull request #31823 from duncathan/atmos-patch12 
Very minor refactor of gas mixture heat_capacity()
 2017-10-18 07:24:46 -05:00
LetterJay
c2be4a21a6 Merge pull request #3476 from Citadel-Station-13/upstream-merge-31831 
[MIRROR] Filters allow air to pass through when not set to filter any gas
 2017-10-18 07:39:26 -04: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
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
LetterJay
bdbf1f509a Merge pull request #3447 from Citadel-Station-13/upstream-merge-31775 
[MIRROR] lowers portable pump max pressure to 25 atm
 2017-10-17 10:18:55 -04:00
LetterJay
db421c0f6b Merge pull request #3451 from Citadel-Station-13/upstream-merge-30972 
[MIRROR] Atmospherics Multilayer Pipes
 2017-10-17 08:58:10 -04:00
LetterJay
a07871c9de Update pump.dm 2017-10-17 07:46:18 -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
35c80edc7a Update pump.dm 2017-10-16 20:52:33 -05:00
Leo
2987fadd2e lowers portable pump max pressure to 25 atm 2017-10-16 19:50:53 -05:00
Leo
201cf2c66b Merge pull request #31771 from tgstation/Cyberboss-patch-5 
Fixes atmos machinery examine
 2017-10-16 16:48:13 -05:00
LetterJay
be2dc49384 Merge pull request #3408 from Citadel-Station-13/upstream-merge-31694 
[MIRROR] Prevents the fire reaction from leaving garbage in the gas mixture
 2017-10-15 10:24:22 -04: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
LetterJay
b02e9c6a90 Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731 
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
 2017-10-15 10:20:04 -04:00
LetterJay
5b4bb85ca1 Merge pull request #3394 from Citadel-Station-13/upstream-merge-31726 
[MIRROR] restores safety check in gas mixture temperature_share()
 2017-10-15 10:19:33 -04:00
duncathan salt
e2e4d7aa60 Prevents the fire reaction from leaving garbage in the gas mixture (#31694) 2017-10-15 08:48:31 -05:00
LetterJay
243d8759c7 Update gas_mixture.dm 2017-10-15 07:51:48 -05: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
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00