Markolie 0117892f54 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact ...

# Conflicts:
#	code/game/machinery/doors/firedoor.dm

2017-02-10 18:18:29 +01:00

..

carbon

Merge remote-tracking branch 'remotes/upstream/master' into objection

2017-02-05 17:11:24 +04:00

silicon

Merge pull request #6321 from uraniummeltdown/aidead

2017-02-06 07:13:05 -08:00

simple_animal

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

2017-02-10 18:18:29 +01:00

autohiss.dm

…

damage_procs.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

death.dm

Fixes defib leaving people in deadchat, n2o paralyse time

2016-11-06 21:36:24 -08:00

default_language.dm

…

life.dm

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

2016-12-29 11:01:43 -05:00

living_defense.dm

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

2017-01-20 23:43:35 +01:00

living_defines.dm

say_log for mobs, fixed changeling absorb memory, changelings can now see past 8 messages of absorbed victim

2017-02-05 22:00:17 +04:00

living.dm

Merge pull request #6358 from Fox-McCloud/all-mobs-hard-del

2017-02-07 19:35:58 -08:00

login.dm

Add Colossus, add outdoors variable to areas and update fireball targeting

2016-10-25 04:10:52 +02:00

logout.dm

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

2016-12-23 19:32:19 +01:00

say.dm

say_log for mobs, fixed changeling absorb memory, changelings can now see past 8 messages of absorbed victim

2017-02-05 22:00:17 +04:00

stat_states.dm

Adds a var for attack log printing

2016-12-28 15:41:03 +01:00

status_procs.dm

copy and paster errrrrrrrr

2016-11-26 01:34:21 -05:00

update_status.dm

forgot this one

2017-02-07 08:54:39 -05:00