Fox McCloud 85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework ...

# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme

2019-08-25 16:51:21 -04:00

..

camera

…

dead

Merge pull request #11712 from Markolie/lazy

2019-08-24 12:27:48 -04:00

living

Merge remote-tracking branch 'upstream/master' into plasmamen-rework

2019-08-25 16:51:21 -04:00

new_player

first pass

2019-07-22 00:05:37 -07:00

abilities.dm

…

death.dm

…

emote.dm

GHOST_EARS/SIGHT improvements

2019-06-03 19:40:48 +02:00

hear_say.dm

GHOST_EARS/SIGHT improvements

2019-06-03 19:40:48 +02:00

holder.dm

…

inventory.dm

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-22 03:54:43 -04:00

language.dm

Observer/hud improvements and fixes

2019-05-27 19:59:54 +02:00

login.dm

…

logout.dm

Merge

2019-05-09 17:06:35 +01:00

mob_defines.dm

Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix

2019-06-03 21:44:01 +02:00

mob_grab.dm

nevermind, just generic fixes

2019-05-08 20:15:24 -04:00

mob_helpers.dm

Merge pull request #11830 from Emanthealmighty/AIchange

2019-08-12 23:08:58 +08:00

mob_movement.dm

More testmerge fixes and improvements

2019-07-09 07:59:12 -04:00

mob_transformation_simple.dm

Sanitize all inputs

2019-07-14 09:35:12 -07:00

mob.dm

Merge pull request #11484 from KasparoVy/double_down

2019-08-04 18:47:08 -04:00

say.dm

…

status_procs.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…

update_status.dm

…