Tigercat2000 58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ...

Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm

2016-08-10 14:16:42 -07:00

..

maploader

All is ablaze

2016-08-07 13:43:15 -07:00

mission_code

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-08 06:21:02 -07:00

bluespaceartillery.dm

Mass replace

2016-07-07 19:34:02 -07:00

corpse.dm

species path to species name

2016-07-15 10:13:32 -07:00

exile.dm

Changed exile implants locker to armory access

2016-07-09 17:38:02 -07:00

gateway.dm

Mass replace

2016-07-07 19:34:02 -07:00

loot.dm

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

map_rng.dm

Fixes init on various things, as well as allowing the

2016-07-07 23:52:44 -07:00

pamphlet.dm

…

snpc.dm

Makes Space Hotel Great Again (#4700)

2016-06-30 20:42:29 -04:00

trigger.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

zlevel.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

zvis.dm

Fixes init on various things, as well as allowing the

2016-07-07 23:52:44 -07:00