Mark van Alphen 09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm

2019-04-18 03:15:52 +02:00

..

carbon

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

2019-04-17 22:46:43 +02:00

silicon

Merge pull request #11259 from Markolie/flukeops

2019-04-18 07:16:31 +08:00

simple_animal

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

2019-04-17 22:46:43 +02:00

autohiss.dm

…

damage_procs.dm

Fixes Some Species Having Oxy Damage

2019-04-02 14:25:29 -04:00

death.dm

Merge pull request #11158 from Fox-McCloud/delayed-gibbing

2019-04-01 23:07:17 +08:00

default_language.dm

…

life.dm

The Nations Update Everyone Deserves!

2019-04-06 20:30:04 -04:00

living_defense.dm

Refacors Electrocution

2019-04-10 18:09:14 -04:00

living_defines.dm

blood drunk miner

2019-04-04 20:34:26 +01:00

living.dm

Merge pull request #11117 from farie82/fixe-antidrop-and-resting-issue

2019-04-01 19:50:48 -04:00

login.dm

Switch to client-side hotkey toggling

2019-04-05 22:45:05 +02:00

logout.dm

SSD miasma v3

2019-02-09 08:56:58 -05:00

say.dm

Fixes whispers not being logged properly

2019-01-26 16:44:07 -08:00

stat_states.dm

Crit Rework Final Submission

2019-03-28 17:28:00 -04:00

status_procs.dm

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

2019-04-04 22:04:55 +02:00

update_status.dm

Crit Rework Final Submission

2019-03-28 17:28:00 -04:00