Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
Jordan Brown
f205911b5a
Adds defines for organ slots
2017-10-15 19:34:42 -05:00
duncathan salt
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
LetterJay
cc0e5a1280
Update jetpack.dm
2017-10-07 23:07:25 -05: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
LetterJay
e8f581bb56
Merge branch 'master' into upstream-merge-31077
2017-09-29 12:46:25 -04:00
LetterJay
c80237c969
Update tank_types.dm
2017-09-29 00:48:53 -05:00
LetterJay
2d1d0b7fd8
Update tank_types.dm
2017-09-29 00:48:01 -05:00
Jordan Brown
8f600788f4
Back and inhands for air tanks.
2017-09-28 10:44:20 -05:00
RandomMarine
ab28e2facb
Air tanks get their own sprite, plus reset fix.
2017-09-27 15:45:41 -05:00
oranges
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
CitadelStationBot
cbfee7e313
[MIRROR] Tank gauge rounding fix ( #2800 )
...
* Merge pull request #30749 from ShizCalev/tank-display-fix
Tank gauge rounding fix
* Tank gauge rounding fix
2017-09-17 11:58:50 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
