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

# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/feet_digi.dmi
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/mask_muzzled.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/items_and_weapons.dmi

2021-06-09 17:40:28 -04:00

..

brain

deterministic explosion system (#13392)

2021-05-12 05:44:53 -05:00

carbon

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

2021-06-09 17:40:28 -04:00

silicon

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

2021-06-09 17:40:28 -04:00

simple_animal

Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon

2021-06-09 11:29:24 -07:00

blood.dm

…

bloodcrawl.dm

deterministic explosion system (#13392)

2021-05-12 05:44:53 -05:00

clickdelay.dm

…

damage_procs.dm

Activity tracking; traitor class tweaks

2021-04-13 06:42:32 -07:00

death.dm

i hate tg code

2021-04-08 18:05:36 -04:00

emote.dm

…

life.dm

Merge branch 'master' into async_2

2021-03-09 00:17:26 -07:00

living_active_block.dm

…

living_active_parry.dm

i did a thing

2021-02-20 17:24:30 -08:00

living_block.dm

…

living_blocking_parrying.dm

…

living_defense.dm

deterministic explosion system (#13392)

2021-05-12 05:44:53 -05:00

living_defines.dm

bigger mobs have some special health bars (#49104)

2021-05-19 11:59:50 -04:00

living_mobility.dm

…

living_movement.dm

Merge remote-tracking branch 'citadel/master' into tgsync

2021-01-08 00:33:57 -08:00

living_signals.dm

…

living_sprint.dm

final tweaks

2021-02-13 20:47:38 -07:00

living.dm

IT WORKS!!

2021-05-19 19:03:21 -04:00

login.dm

…

logout.dm

…

say.dm

stops racism

2021-03-17 21:58:41 -04:00

stamina_buffer.dm

…

status_procs.dm

…

taste.dm

…

update_icons.dm

…

ventcrawling.dm

…