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

# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm

2021-05-02 22:47:39 -04:00

..

alien

Merge remote-tracking branch 'origin/master' into hardsync-1.5

2021-02-16 19:41:53 +08:00

human

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

2021-05-02 22:47:39 -04:00

monkey

init

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

carbon_active_parry.dm

…

carbon_defense.dm

Update carbon_defense.dm

2021-01-14 04:33:15 -07:00

carbon_defines.dm

corruption handling (for carbons)

2020-11-01 06:09:53 +01:00

carbon_movement.dm

…

carbon_sprint.dm

…

carbon.dm

Literally just adds targets to give because i forgot to do that

2021-03-16 11:48:21 +02:00

damage_procs.dm

Activity tracking; traitor class tweaks

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

death.dm

hugboxy shit

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

emote.dm

…

examine.dm

…

handle_corruption.dm

edge cases

2021-01-12 21:18:33 +01:00

inventory.dm

it compiles, UNTESTED YET

2021-02-13 21:41:59 +08:00

life.dm

ImmursionAudio(TM)

2020-12-21 19:47:11 +08:00

say.dm

Update say.dm

2021-02-14 11:41:29 -05:00

status_procs.dm

ImmursionAudio(TM)

2020-12-21 19:47:11 +08:00

update_icons.dm

…