shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,299 Commits 5 Branches 0 Tags
cf9aff2995e41d760804aa80339e973260f2d3ea
Commit Graph

151 Commits

Author SHA1 Message Date
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
LetterJay
9050b8c719 Update gas_types.dm 2017-10-12 02:56:56 -05:00
duncathan salt
e61b6aecd7 unfucks filters 2017-10-12 01:07:52 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Jordan Brown
061ddd3a29 Fixes init times 2017-10-12 00:29:36 -05:00
nicbn
c8cfb3abeb Cleans up atmos unary machinery code (#31356) 
* Cleans up atmos unary machinery code

* return 0 and return are different things: cryo.dm

* same: oxygen generator

* same: vent pump

* same: vent scrubber

* Reveiw

* Update vent_scrubber.dm

* Update vent_scrubber.dm
 2017-10-10 12:28:12 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
LetterJay
fe2e29f0f8 Merge pull request #3210 from Citadel-Station-13/upstream-merge-31388 
[MIRROR] Moves assert_gas() into a define it should always have been, speeding up atmos slightly
 2017-10-08 16:19:12 -04:00
Jordan Brown
4f32b7a0d4 Moves assert_gas() into a define it should always have been, speeding up atmos slightly 2017-10-07 13:37:28 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
vuonojenmustaturska
648040de9c Makes a couple of atmos procs a tiny bit faster, removes /datum/gas_mixture/thermal_energy() (#31321) 
* Atmos stuff

* moved the define
 2017-10-05 17:58:54 -05:00
oranges
baa53ba1d3 Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA 
Makes mobs on fire light up
 2017-10-03 18:14:10 -05:00
bawhoppen
82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
kingofkosmos
f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
LetterJay
d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
Jordan Brown
0a43bddaa1 Merge pull request #30863 from pubby/bluepipe 
Bluespace pipes
 2017-09-25 12:28:14 -05:00
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
CitadelStationBot
a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875) 
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
 2017-09-22 23:35:54 -05:00
CitadelStationBot
eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895) 
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
 2017-09-22 23:35:36 -05:00
CitadelStationBot
3e2f638793 [MIRROR] Cleans up internal temp code (#2853) 
* Cleans up internal temp code (#30715)

* cleanup

* Update living.dm

* Update atoms.dm

* Update objs.dm

* Cleans up internal temp code

* Update living.dm

* Update living.dm

* fixes then ommits mob_temp stuff.

* wew lad. commenting shit out is picky af.
 2017-09-22 20:20:56 -05:00
CitadelStationBot
cc49f70de8 [MIRROR] Make scrubber code use temporary vars consistently (#2862) 
* Make scrubber code use temporary vars consistently

* fixes merge mess
 2017-09-22 20:11:50 -05:00
CitadelStationBot
bf1e4a456f [MIRROR] Improve atmos components code + OmegaStation fixes (#2752) 
* Improve atmos components code + OmegaStation fixes

* Update circulator.dm

* Update dp_vent_pump.dm

* Update pump.dm

* Update volume_pump.dm

* Update pump.dm

* Update pump.dm

* Update volume_pump.dm

* fixes pumps shows area rather than vague jump

also removes it from admin log, wew

* wew
 2017-09-22 20:05:58 -05:00
CitadelStationBot
2599bca054 [MIRROR] Taking the beaker out of a cryotube now tries to put it into your hand (#2904) 
* Taking the beaker out of a cryotube now tries to put it into your hand (#30938)

* Taking the beaker out of a cryotube now tries to put it into your hand

* this is better

* THIS is better

* Fixes potential bugs

* Update cryo.dm

* Taking the beaker out of a cryotube now tries to put it into your hand
 2017-09-22 18:58:22 -05:00
LetterJay
e154c27a72 Update circulator.dm 2017-09-21 06:35:01 -05:00