LetterJay 30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

..

alien

Merge branch 'master' into upstream-merge-33783

2017-12-29 06:49:47 -06:00

human

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

monkey

more save points

2017-12-29 00:07:36 -06:00

carbon_defense.dm

more save points

2017-12-29 00:07:36 -06:00

carbon_defines.dm

[Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)

2017-12-18 20:29:37 -06:00

carbon_movement.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

carbon.dm

more save points

2017-12-29 00:07:36 -06:00

damage_procs.dm

Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405

2017-12-21 03:42:38 +00:00

death.dm

…

emote.dm

…

examine.dm

Merge branch 'master' into upstream-merge-32311

2017-12-29 18:38:50 -06:00

give.dm

Update give.dm

2017-10-08 14:55:37 -05:00

inventory.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

life.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

say.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

status_procs.dm

fk

2017-12-29 01:20:09 -06:00

update_icons.dm

more save points

2017-12-29 00:07:36 -06:00