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

# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi

2021-02-14 10:42:59 -05:00

..

brain

…

carbon

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

2021-02-14 10:42:59 -05:00

silicon

medica medica medica medica

2021-02-10 20:53:29 -05:00

simple_animal

Merge pull request #14136 from shellspeed1/Fixes-infinite-floor-tiles

2021-01-25 23:01:23 -07:00

blood.dm

…

bloodcrawl.dm

…

clickdelay.dm

…

damage_procs.dm

bonk

2021-01-09 22:30:09 +01:00

death.dm

hugboxy shit

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

emote.dm

let them beep

2020-12-14 01:00:29 +00:00

life.dm

…

living_active_block.dm

…

living_active_parry.dm

Merge pull request #13890 from silicons/parry

2021-02-05 23:52:18 -06:00

living_block.dm

…

living_blocking_parrying.dm

changes

2020-12-27 10:13:09 -08:00

living_defense.dm

…

living_defines.dm

Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor

2021-01-24 19:21:24 -05:00

living_mobility.dm

changes

2020-12-21 17:14:22 -07:00

living_movement.dm

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

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

living_signals.dm

changes

2020-12-21 17:14:22 -07:00

living_sprint.dm

…

living.dm

Update living.dm

2021-02-08 17:04:55 +00:00

login.dm

init

2020-12-26 06:02:09 -05:00

logout.dm

…

say.dm

Moving a thing

2021-02-01 09:14:44 -05:00

stamina_buffer.dm

…

status_procs.dm

…

taste.dm

…

update_icons.dm

…

ventcrawling.dm

removes setup for ventcrawl implant in case of redundancy

2020-12-27 02:20:19 -05:00