ZeroMan 93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies ...

# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm

2020-03-21 02:17:13 -04:00

..

brain

No comment.

2020-03-16 17:13:56 +01:00

carbon

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

2020-03-21 02:17:13 -04:00

silicon

Update robot_modules.dm

2020-03-20 01:52:43 -04:00

simple_animal

Merge pull request #11503 from necromanceranne/45_nerf_kitchengun_buff

2020-03-17 09:25:51 -07:00

blood.dm

extra runtime fixes, also porting tgstation#49997

2020-03-19 04:49:01 +01:00

bloodcrawl.dm

…

damage_procs.dm

…

death.dm

…

emote.dm

Me 2048

2020-03-07 00:57:25 +01:00

life.dm

Blob refactor (#43872)

2020-03-06 15:58:17 -05:00

living_defense.dm

Ports "Switches out the three billion args of electrocute act for flags"

2020-03-09 04:01:23 +01:00

living_defines.dm

fixes

2020-02-24 01:59:45 -07:00

living_mobility.dm

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

2020-03-06 04:00:36 +01:00

living_movement.dm

In case it wasn't shitcode enough, makes it reset on move

2020-03-06 22:05:56 -05:00

living.dm

Update living.dm

2020-03-10 19:39:11 -07:00

login.dm

Deletes the preferences_vore datum and migrates its contents to preferences.

2020-02-29 15:07:44 +01:00

logout.dm

…

say.dm

…

status_procs.dm

…

taste.dm

…

update_icons.dm

…

ventcrawling.dm

ok

2020-03-05 01:00:35 -07:00