cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
6e07981e67a3828f5ba2a84fdf70e0d9bd77ca8c
CHOMPStation2/code/WorkInProgress
History
Mloc-Argent 65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 22:01:16 +01:00
..
AI_Visibility
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
animusstation
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
Apples
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
Cael_Aislinn
Merge conflict fix.
2013-09-14 22:49:11 +03:00
carn
Adds explosive implant admin messages, and jump button for explosions.
2013-08-12 12:34:13 +01:00
Chinsky
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
Cib
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
kilakk
Added in an awesome fax machine sprite by Cajoes
2013-09-18 19:41:29 -04:00
Mini
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
Mloc
HUD Update
2012-05-23 22:58:52 +01:00
organs
Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12
2012-08-22 04:00:11 +10:00
Ported
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
Sigyn
Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white.
2013-01-21 00:11:48 +00:00
SkyMarshal
Refactors code to work with BYOND 500.
2013-09-22 12:39:48 +01:00
Susan
Refactors code to work with BYOND 500.
2013-09-22 12:39:48 +01:00
Tastyfish
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
Wrongnumber
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
autopsy.dm
Verb categories.
2013-09-19 08:30:05 +03:00
buildmode.dm
This just fixes a small typo in build mode.
2013-06-09 03:16:51 -04:00
explosion_particles.dm
Garbage collection for fire and explosive particles.
2013-10-05 23:25:41 +01:00
meteors.dm
Expansion of every "icon = ''" path.
2013-09-01 21:53:36 +01:00
periodic_news.dm
Removes a few typos from channel names
2013-06-09 18:04:27 -04:00