Mark van Alphen ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme

2019-04-30 19:26:17 +02:00

..

radio

Kills off Object and Fast Object Processes

2019-04-23 23:53:40 -04: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

Kills off Object and Fast Object Processes

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

flash.dm

Kills off Object and Fast Object Processes

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

flashlight.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-04-30 19:26:17 +02:00

floor_painter.dm

…

handheld_defib.dm

Crit Rework Final Submission

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

instruments.dm

Suicide Refactor

2019-03-27 22:54:26 -04:00

laserpointer.dm

Kills off Object and Fast Object Processes

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

lightreplacer.dm

…

machineprototype.dm

…

megaphone.dm

Multilingualism

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

multitool.dm

Kills off Object and Fast Object Processes

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

paicard.dm

…

pipe_painter.dm

…

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

Kills off Object and Fast Object Processes

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

sensor_device.dm

…

taperecorder.dm

[Goonchem] Reagent Temperature

2019-03-18 20:06:15 -04:00

thermal_drill.dm

Tweaks made.

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

traitordevices.dm

…

transfer_valve.dm

Multilingualism

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

uplinks.dm

Merge pull request #11081 from Kyep/hijack_limits

2019-04-04 09:30:56 +08:00

whistle.dm

…