Markolie f2497afd9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals ...

# Conflicts:
#	_maps/map_files/cyberiad/z2.dmm
#	code/__DEFINES/is_helpers.dm
#	code/__DEFINES/misc.dm
#	code/_globalvars/lists/objects.dm
#	code/modules/mob/living/living_defines.dm
#	icons/effects/beam.dmi

2017-02-05 20:12:51 +01:00

..

maploader

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

2016-10-07 23:51:48 -04:00

mission_code

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

2016-09-11 19:50:53 -04:00

corpse.dm

Legion fixes, debug controller additions, turret fix

2016-10-24 03:04:37 +02:00

exile.dm

Changed exile implants locker to armory access

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

gateway.dm

Ghosts can now click on the home gateway to teleport

2016-12-24 22:42:47 -08: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

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

zvis.dm

Fixes init on various things, as well as allowing the

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