zerothebigboy 8456b3f709 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum ...

# Conflicts:
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/clothing/suits.dmi

2021-03-19 14:30:05 -04:00

..

camera

emote over holopad

2020-12-13 22:18:54 +00:00

dead

new hair

2021-03-10 18:14:07 -05:00

living

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

2021-03-19 14:30:05 -04:00

clickdelay.dm

…

death.dm

hugboxy shit

2021-01-20 15:06:53 -07:00

emote.dm

…

innate_abilities.dm

fix

2020-11-22 02:48:37 -07:00

inventory.dm

oops forgot this reg

2021-03-09 10:09:02 +08:00

login.dm

Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""

2020-10-11 00:53:18 +02:00

logout.dm

…

mob_defines.dm

smooth movement twaeks

2021-01-09 15:30:56 -08:00

mob_helpers.dm

a

2021-02-15 19:35:16 -07:00

mob_movement.dm

smooth movement twaeks

2021-01-09 15:30:56 -08:00

mob_transformation_simple.dm

…

mob.dm

Merge pull request #13772 from silicons/respawn_system_2

2020-12-22 17:40:33 +01:00

say_readme.dm

more

2020-11-12 23:36:18 -07:00

say_vr.dm

OH FUCK

2021-01-20 11:49:53 +08:00

say.dm

COME ON

2020-11-26 23:37:27 -07:00

status_procs.dm

…

transform_procs.dm

Update transform_procs.dm

2021-02-27 15:57:04 -03:00

typing_indicator.dm

Update typing_indicator.dm

2020-12-02 23:43:00 -07:00

update_icons.dm

more

2020-11-12 23:36:18 -07:00