shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,151 Commits 5 Branches 0 Tags
32fb136bf00a970f8b1bed31182e5202a4e0b330
Commit Graph

174 Commits

Author SHA1 Message Date
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
duncathan salt
b840605cb6 restores safety check in gas mixture temperature_share() (#31726) 2017-10-14 15:53:33 -05:00
duncathan salt
9a4ee4d5a4 removes filter and scrubber pressure exploits (#31684) 2017-10-14 15:20:49 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
LetterJay
09d929e9ca Merge branch 'master' into upstream-merge-31643 2017-10-13 07:59:09 -04:00
LetterJay
58b8a02802 Update gas_mixture.dm 2017-10-13 02:59:04 -05:00
LetterJay
b08f278127 Merge pull request #3320 from Citadel-Station-13/upstream-merge-31580 
[MIRROR] Fixes init times
 2017-10-13 02:02:16 -04:00
LetterJay
b43a207390 Merge pull request #3349 from Citadel-Station-13/upstream-merge-31586 
[MIRROR] Fixes canisters breaking multiple times
 2017-10-13 00:20:38 -04:00
LetterJay
25396db2df Merge pull request #3332 from Citadel-Station-13/upstream-merge-31605 
[MIRROR] Fixes cryo
 2017-10-12 23:45:42 -04:00
Jordan Brown
14dcd3aee5 Activates global warming 2017-10-12 20:04:15 -05:00
YPOQ
848016ab15 Fixes canisters breaking multiple times (#31586) 2017-10-12 15:48:17 -05:00
Jordan Brown
763bcc59ee Merge pull request #31605 from AnturK/cryofix 
Fixes cryo
 2017-10-12 11:56:09 -05:00
duncathan salt
425915615b makes vacuums "cold", sort of (#31542) 2017-10-12 11:47:51 -05:00
LetterJay
41846d0793 Merge branch 'master' into upstream-merge-31599 2017-10-12 11:00:37 -04:00
LetterJay
4a8f3d0e41 fuck this shit 2017-10-12 09:58:16 -05:00
LetterJay
22899f1942 Merge branch 'master' into upstream-merge-31580 2017-10-12 07:22:11 -04:00
LetterJay
7b27e2d7ad Update filter.dm 2017-10-12 02:58:41 -05:00
LetterJay
2edc2c66e9 Update vent_scrubber.dm 2017-10-12 02:57:54 -05:00