skull132 b20032ea25 Merge branch 'master' into development

2017-01-23 15:52:13 -05:00

..

devices

Add a holowarrant to the secborg preset. (#1615)

2017-01-23 21:07:37 +02:00

robot

Fixing more error and the return of banhammer (#10)

2016-11-18 23:03:56 +02:00

stacks

Tray, paper bin and bottle fixes (#1631)

2017-01-23 23:41:33 +02:00

weapons

Tray, paper bin and bottle fixes (#1631)

2017-01-23 23:41:33 +02:00

apc_frame.dm

…

bees_items.dm

Beekeeping fixes and tweaks (#1337)

2016-12-30 20:28:53 +02:00

blueprints.dm

…

bodybag.dm

Gripper, Nymph and Mob size fixes (#1575)

2017-01-15 20:56:15 +02:00

contraband.dm

…

crayons.dm

Attack Proc fixes (#1259)

2016-12-24 03:34:23 +02:00

glassjar.dm

Plenty'o'fixes (#1478)

2017-01-09 01:04:36 +02:00

latexballoon.dm

…

paintkit.dm

Probably fixes all the issues with computers sprites (#1378)

2017-01-03 01:36:00 +02:00

shoe_cover.dm

Del() -> Qdel()

2016-02-07 14:59:21 +02:00

shooting_range.dm

…

toys.dm

Travis: Indentation / list fixes (#1254)

2016-12-19 16:40:52 +02:00

trash.dm

Adding unathi snacks (#621)

2016-07-24 23:55:17 +03:00