uraniummeltdown c4dd6f533f Merge remote-tracking branch 'remotes/upstream/master' into tanksprites ...

# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi

2017-02-13 21:01:58 +04:00

..

devices

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

2017-02-11 20:31:23 +01:00

mountable_frames

…

robot

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00

stacks

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

2017-02-08 19:21:57 +01:00

weapons

Merge remote-tracking branch 'remotes/upstream/master' into tanksprites

2017-02-13 21:01:58 +04:00

ashtray.dm

…

blueprints.dm

Merge branch 'master' into lavaland_megafauna

2017-02-02 20:17:31 +01:00

bodybag.dm

…

candle.dm

…

changestone.dm

…

contraband.dm

…

control_wand.dm

…

crayons.dm

Various fixes

2017-02-10 18:55:23 +01:00

dehy_carp.dm

…

documents.dm

…

flag.dm

…

latexballoon.dm

…

misc.dm

…

policetape.dm

…

random_items.dm

…

shooting_range.dm

…

toys.dm

Refactors Reagent Tanks--Adds High Capacity Water Tank

2017-02-05 13:58:24 -05:00

trash.dm

…