0256d9af4a
Update tools.dm
2017-10-29 22:41:56 -05:00
36893d3188
welder refuelling hotfix
2017-10-29 17:23:15 -05:00
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
ac660b6e3e
Invisible wirecutters and made screwdrivers hivis ( #31649 )
2017-10-13 18:35:58 -05:00
82db333ee3
Update tools.dm
2017-09-12 03:36:41 -05:00
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
e5aed03bcb
all of my HATE
2017-09-10 15:20:58 -05:00
50587ea679
Update tools.dm
2017-09-10 15:18:30 -05:00
33f35fe4d2
Update tools.dm
2017-09-10 11:46:34 -05:00
d73b82cf11
Gets rid of manual overlay manipulation
2017-09-06 23:39:08 -05:00
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
LetterJay