coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
bebee8ded9ef65409ff458a773f8a3b6c236cdfd
kiwistation/code/game/gamemodes
T
History
carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
..
blob
SubSystem rewrite
2014-12-31 13:25:41 +00:00
changeling
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-04 01:52:14 +00:00
cult
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-04 01:52:14 +00:00
extended
Removes two unused vars of the gamemode datums, uplink_welcome and uplink_uses.
2014-09-11 06:06:59 -03:00
gang
Fixed stuff tkdrg pointed out
2014-12-28 10:49:04 +03:00
malfunction
SubSystem rewrite
2014-12-31 13:25:41 +00:00
meteor
SubSystem rewrite
2014-12-31 13:25:41 +00:00
monkey
Cuts /disease variables from 28 to 23 (includes new ones)
2014-10-30 06:21:14 +00:00
nuclear
SubSystem rewrite
2014-12-31 13:25:41 +00:00
revolution
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-04 01:52:14 +00:00
sandbox
SubSystem rewrite
2014-12-31 13:25:41 +00:00
traitor
Fixed stuff tkdrg pointed out
2014-12-28 10:49:04 +03:00
wizard
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-04 01:52:14 +00:00
antag_hud.dm
Changes the antag hud ERROR()s to CRASH()s
2014-12-08 13:50:09 -03:00
antag_spawner.dm
Revert "Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them"
2014-09-19 13:38:10 -03:00
events.dm
Priority Announcement Changes
2014-05-05 22:18:57 -06:00
factions.dm
Uplink Update:
2013-04-02 01:02:54 +01:00
game_mode.dm
SubSystem rewrite
2014-12-31 13:25:41 +00:00
intercept_report.dm
- Removes the useless has_been_rev var
2014-09-26 21:37:07 -06:00
objective_items.dm
Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.
2014-12-09 19:38:49 -08:00
objective.dm
SubSystem rewrite
2014-12-31 13:25:41 +00:00
setupgame.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-04 01:52:14 +00:00