Jordan Brown
6977eb6ce2
Merge pull request #34475 from ShizCalev/internals-metal
...
Makes tanks made of metal
2018-01-16 08:34:13 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -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
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
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
