Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage ...

# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm

2019-09-28 00:16:11 -04:00

..

_defines.dm

Added SlimeHUD

2019-07-01 18:08:19 +02:00

action_button.dm

Revert "Code cleanup"

2019-07-09 22:08:40 +02:00

ai.dm

AI can now change its intent

2019-07-12 14:27:48 +02:00

alert.dm

TG Buckle Update (#12375)

2019-09-22 18:22:57 -07:00

alien_larva.dm

Adds movement intents

2017-06-10 10:12:14 +01:00

alien.dm

Devil game mode

2019-01-13 12:00:49 +01:00

blob_overmind.dm

Increased the resources needed to create blobbernauts

2019-08-01 13:39:14 +02:00

bot.dm

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

constructs.dm

comment spree

2016-11-10 08:39:20 -05:00

devil.dm

Add fake ambient occlusion

2019-04-21 01:45:30 +02:00

fullscreen.dm

Darkness fixes

2019-04-24 00:47:55 +02:00

ghost.dm

Update for parity with tg's parallax implementation

2019-08-14 17:53:15 -07:00

guardian.dm

Custom icons for Guardian action intents!

2019-03-13 19:23:27 +01:00

hud.dm

Rebalances Golems, Refactors Species Based Equipping (#12358)

2019-09-21 06:10:37 -07:00

human.dm

Rebalances Golems, Refactors Species Based Equipping (#12358)

2019-09-21 06:10:37 -07:00

movable_screen_objects.dm

added action button ability to lock or unlock them in place

2019-05-21 22:44:54 +02:00

other_mobs.dm

New Blob UI! Ported from /TG/. Also adds new reorganized Blob Help verb to help out new players in playing Blob.

2019-03-25 18:35:54 +01:00

parallax.dm

fixes some missing arguments and runtimes

2019-09-16 16:18:16 -04:00

picture_in_picture.dm

nevermind, just generic fixes

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

plane_master.dm

Make lighting plane master respect client color

2019-05-10 20:34:11 +02:00

radial.dm

Remove unneeded check.

2018-12-16 21:17:49 +01:00

robot.dm

Add fake ambient occlusion

2019-04-21 01:45:30 +02:00

screen_objects.dm

though-this-world-may-be-broken

2019-09-15 05:53:43 -04:00

slime.dm

Makes Xenobiology Simpler. Removes Slimes (#12398)

2019-09-24 16:17:33 -07:00

swarmer.dm

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00