Poojawa 4fdddc7b4d clears a merge conflict

2019-10-17 05:37:44 -05:00

..

camera

Porting a load of disease/symptoms code updates.

2019-10-05 07:14:25 +02:00

dead

Merge pull request #9491 from Poojawa/wingfix

2019-10-15 22:59:45 -07:00

living

clears a merge conflict

2019-10-17 05:37:44 -05:00

death.dm

…

emote.dm

…

inventory.dm

Fixes lack of arguments on mobs' can_equip.

2019-10-09 00:21:55 +02:00

login.dm

…

logout.dm

…

mob_defines.dm

…

mob_helpers.dm

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-10-11 23:10:45 -05:00

mob_movement.dm

…

mob_movespeed.dm

…

mob_transformation_simple.dm

…

mob.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45

2019-10-09 01:18:30 +02:00

say_readme.dm

…

say_vr.dm

Update say_vr.dm

2019-07-24 17:31:24 -07:00

say.dm

…

status_procs.dm

…

transform_procs.dm

Fixing head rev blebs

2019-10-09 18:18:49 +02:00

update_icons.dm

…