Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi

2017-01-31 17:44:38 +01:00

..

devices

Merge pull request #6226 from Fox-McCloud/debug-this

2017-01-25 04:15:18 -08:00

mountable_frames

Fix light fixture frame progress bar

2016-10-15 12:47:38 +02:00

robot

Fully rips out cyborg sight modules

2017-01-10 00:32:11 -08:00

stacks

Tiger's comments

2017-01-22 19:15:26 +01:00

weapons

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

2017-01-31 17:44:38 +01:00

ashtray.dm

…

blueprints.dm

Add Colossus, add outdoors variable to areas and update fireball targeting

2016-10-25 04:10:52 +02:00

bodybag.dm

…

candle.dm

…

changestone.dm

…

contraband.dm

…

control_wand.dm

…

crayons.dm

Graffiti prints are now hidden

2017-01-12 20:24:17 +00:00

dehy_carp.dm

…

documents.dm

…

flag.dm

…

latexballoon.dm

…

misc.dm

…

policetape.dm

…

random_items.dm

…

shooting_range.dm

…

toys.dm

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

2016-12-01 22:38:35 -05:00

trash.dm

…