LetterJay e7d9cd0698 Merge branch 'master' into upstream-merge-37597

2018-05-23 05:21:19 -05:00

..

alien

Merge branch 'master' into upstream-merge-37486

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

human

Merge branch 'master' into upstream-merge-37597

2018-05-23 05:21:19 -05:00

monkey

Merge branch 'master' into upstream-merge-37486

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

carbon_defense.dm

replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2

2018-05-02 13:14:43 -05:00

carbon_defines.dm

Fixed instant summon behavior with simple animals (#35780)

2018-02-19 22:08:01 -06:00

carbon_movement.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

carbon.dm

Merge branch 'master' into upstream-merge-37486

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

damage_procs.dm

Merge pull request #37516 from XDTM/LinearBrainDamage

2018-05-01 09:56:39 -05:00

death.dm

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

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

emote.dm

Update emote.dm

2018-05-20 16:35:51 -05:00

examine.dm

[READY] A few additions, tweaks, and fixes for integrated circuits (#36270)

2018-04-22 02:31:10 -05:00

give.dm

…

inventory.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

life.dm

Merge branch 'master' into upstream-merge-37486

2018-05-21 08:59:32 -05:00

say.dm

Adds a French beret! HONH HONH HONH! (#37457)

2018-05-09 16:03:28 -05:00

status_procs.dm

Fixes mannitol not curing minor brain traumas (#36645)

2018-04-03 22:03:20 -05:00

update_icons.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00