LetterJay 7682dd2a7f Merge pull request #6188 from Citadel-Station-13/upstream-merge-36822 ...

[MIRROR] Fixes monkey retaliation from beyond the grave

2018-04-01 19:51:17 -05:00

..

alien

Merge pull request #36856 from iskyp/resin+egg

2018-04-01 11:11:38 -05:00

human

Merge pull request #6185 from Citadel-Station-13/upstream-merge-36816

2018-04-01 19:50:58 -05:00

monkey

Update combat.dm

2018-04-01 17:39:41 -05:00

carbon_defense.dm

Added a new ability to sentient diseases

2018-03-31 06:14:54 -05:00

carbon_defines.dm

Fixed instant summon behavior with simple animals (#35780)

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

carbon_movement.dm

Merge pull request #36617 from ShizCalev/logging-cleanup

2018-03-28 12:17:32 -05:00

carbon.dm

Merge pull request #36617 from ShizCalev/logging-cleanup

2018-03-28 12:17:32 -05:00

damage_procs.dm

[READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)

2018-03-11 13:32:44 -07:00

death.dm

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

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

emote.dm

LOCAL SUNE PORTS... OH GOD WHAT HAPPENED

2018-03-18 09:02:13 -05:00

examine.dm

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

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

give.dm

…

inventory.dm

living carbon

2018-01-04 01:36:28 -05:00

life.dm

[MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)

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

say.dm

living carbon

2018-01-04 01:36:28 -05:00

status_procs.dm

[MIRROR] Fixes some more trauma bugs (#6039)

2018-03-21 12:50:22 -05:00

update_icons.dm

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

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