Thalpy 696d879874 Merge branch 'master' into master

2019-06-29 15:48:25 +01:00

..

alien

Merge pull request #8547 from Ghommie/Ghommie-cit29

2019-06-08 01:22:16 -07:00

human

Merge branch 'master' into master

2019-06-29 15:48:25 +01:00

monkey

Fixes "Bubbles ate my Cohiba Robusto!"

2019-06-27 05:32:08 +02:00

carbon_defense.dm

Merge pull request #8570 from Trilbyspaceclone/patch-170

2019-06-16 19:40:01 -07:00

carbon_defines.dm

carbon Oxygen toxicity

2019-03-21 15:05:58 -05:00

carbon_movement.dm

forgot to pull from upstream. One second.

2019-06-06 15:20:27 +02:00

carbon.dm

Merge remote-tracking branch 'upstream/master'

2019-06-19 21:02:30 +01:00

damage_procs.dm

forgot to pull from upstream. One second.

2019-06-06 15:20:27 +02:00

death.dm

module things, jfc

2018-09-11 07:51:01 -05:00

emote.dm

…

examine.dm

forgot to pull from upstream. One second.

2019-06-06 15:20:27 +02:00

give.dm

…

inventory.dm

and finally, the modules folder. Now I can publish and take a break

2018-07-02 01:19:37 -04:00

life.dm

Merge branch 'pr/18'

2019-06-23 19:15:07 +01:00

say.dm

Velvet speech reconfig.

2019-06-13 06:51:11 +01:00

status_procs.dm

module things, jfc

2018-09-11 07:51:01 -05:00

update_icons.dm

forgot to pull from upstream. One second.

2019-06-06 15:20:27 +02:00