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

..

radio

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

aicard.dm

…

autopsy.dm

Can apply tape to some more items

2019-01-26 14:42:57 +00:00

camera_bug.dm

Kills off Object and Fast Object Processes

2019-04-23 23:53:40 -04:00

chameleonproj.dm

nor-shall-our-souls-falter

2019-09-17 16:06:09 -04:00

enginepicker.dm

Minor optimization and comments

2019-08-04 01:02:30 +03:00

flash.dm

SSticker

2019-04-30 16:47:47 +01:00

flashlight.dm

though-this-world-may-be-broken

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

floor_painter.dm

…

handheld_defib.dm

Crit Rework Final Submission

2019-03-28 17:28:00 -04:00

instruments.dm

though-this-world-may-be-broken

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

laserpointer.dm

Kills off Object and Fast Object Processes

2019-04-23 23:53:40 -04:00

lightreplacer.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

machineprototype.dm

…

megaphone.dm

Chameleon overhaul

2019-05-01 20:59:41 +02:00

multitool.dm

Kills off Object and Fast Object Processes

2019-04-23 23:53:40 -04:00

paicard.dm

though-this-world-may-be-broken

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

pipe_painter.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

pizza_bomb.dm

tweak: changes trapped pizza box auto-arm from 1s to 3s timer

2018-12-06 19:25:31 -08:00

powersink.dm

fixups

2019-04-29 04:41:31 -04:00

scanners.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

sensor_device.dm

…

taperecorder.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

thermal_drill.dm

Tweaks made.

2018-11-07 16:04:18 -08:00

traitordevices.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

transfer_valve.dm

Multilingualism

2018-11-24 00:22:05 -08:00

uplinks.dm

SSticker

2019-04-30 16:47:47 +01:00

voice.dm

Sanitize all inputs

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

whistle.dm

…