LetterJay 5f27ac30c7 Merge branch 'master' into upstream-merge-37582

2018-05-22 07:22:42 -05:00

..

humanoid

Merge branch 'master' into upstream-merge-37582

2018-05-22 07:22:42 -05:00

larva

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

special

Merge branch 'master' into upstream-merge-37486

2018-05-21 11:59:57 -05:00

alien_defense.dm

…

alien.dm

mob stuff

2018-04-23 02:26:53 -05:00

damage_procs.dm

Removes xeno stun and stamina immunity (#5616)

2018-02-23 19:18:52 -06:00

death.dm

…

emote.dm

…

life.dm

[MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)

2018-02-23 17:42:57 -06:00

login.dm

…

logout.dm

…

organs.dm

[MIRROR] Replaced body zone magic strings with defines (#6004)

2018-03-19 21:18:57 -05:00

say.dm

…

screen.dm

…

status_procs.dm

Removes xeno stun and stamina immunity (#5616)

2018-02-23 19:18:52 -06:00

update_icons.dm

…