6efb76fad5
[MIRROR] Ammo cleanup ( #2643 )
...
* Ammo cleanup
* Update briefcase.dm
* Update manned_turret.dm
* Update mime.dm
* Update manned_turret.dm
* Update manned_turret.dm
* fixes
* mime memes
2017-09-22 22:30:44 -05:00
201cb984c8
[MIRROR] Fix ingredient box icon (again) ( #2823 )
...
* Fix ingredient boxes
* Fix ingredient box icon (again)
2017-09-17 22:36:21 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
2bfc7872fa
cleanup
2017-09-02 07:06:37 -05:00
9cb65df70d
Merge pull request #2426
2017-08-29 22:27:21 -07:00
408acdd66d
sync
2017-08-29 22:05:16 -07:00
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
301a581e64
sync
2017-08-29 09:41:11 -07:00
292f5d5d35
Update boxes.dm
2017-08-29 01:46:21 -05:00
f191f5c827
Fixes ingredients-box sprite.
2017-08-28 14:39:03 -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
CitadelStationBot