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

# Conflicts:
#	tgstation.dme

2021-09-19 15:23:52 -04:00

..

alien

Merge pull request #14685 from Arturlang/fake_blood

2021-08-11 02:54:49 -07:00

human

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

2021-09-19 15:23:52 -04:00

monkey

Merge pull request #14971 from Arturlang/nanite_updates

2021-08-08 04:06:18 -07:00

carbon_active_parry.dm

…

carbon_defense.dm

/obj/screen --> /atom/movable/screen

2021-07-29 13:57:19 +03:00

carbon_defines.dm

…

carbon_movement.dm

…

carbon_sprint.dm

…

carbon.dm

Merge pull request #14685 from Arturlang/fake_blood

2021-08-11 02:54:49 -07:00

damage_procs.dm

…

death.dm

…

emote.dm

…

examine.dm

…

handle_corruption.dm

…

inventory.dm

/obj/screen --> /atom/movable/screen

2021-07-29 13:57:19 +03:00

life.dm

/obj/screen --> /atom/movable/screen

2021-07-29 13:57:19 +03:00

say.dm

…

status_procs.dm

/obj/screen --> /atom/movable/screen

2021-07-29 13:57:19 +03:00

update_icons.dm

/obj/screen --> /atom/movable/screen

2021-07-29 13:57:19 +03:00