Hawk_v3 ff20e10352 Merge remote-tracking branch 'upstream/master'

2019-07-20 22:51:13 +01:00

..

devices

Merge remote-tracking branch 'upstream/master'

2019-07-20 22:51:13 +01:00

robot

Merge pull request #4881 from Heroman3003/borg-resization

2019-04-11 12:35:21 -04:00

stacks

Merge pull request #6221 from mistyLuminescence/bettersplinting

2019-06-21 17:06:38 -04:00

weapons

Merge remote-tracking branch 'upstream/master'

2019-07-19 22:05:31 +01:00

antag_spawners.dm

…

apc_frame.dm

Merge pull request #6085 from Heroman3003/apc-cost-fix

2019-04-15 18:29:58 -04:00

bells.dm

Merge pull request #6169 from GeneriedJenelle/patch-1

2019-05-28 14:25:49 -04:00

blueprints.dm

…

bodybag.dm

Adds Robobags (#6059)

2019-04-18 01:40:39 -04:00

contraband_vr.dm

…

contraband.dm

Grey scale pills and colored pillbottles

2019-06-16 21:28:56 -04:00

crayons.dm

Merge pull request #6094 from Heroman3003/anti-magic-markers

2019-04-16 23:09:02 -04:00

glassjar.dm

Sif Animal Expansion 1

2019-05-21 19:58:19 -04:00

godfigures.dm

…

gunbox_vr.dm

…

gunbox_yw.dm

RE-added NSFW weapon to the BSG secondary box.

2019-04-15 18:10:30 +01:00

gunbox.dm

…

latexballoon.dm

…

paintkit.dm

…

poi_items.dm

…

robobag.dm

Adds Robobags (#6059)

2019-04-18 01:40:39 -04:00

shooting_range.dm

…

toys.dm

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

trash_vr.dm

ohno

2019-05-31 18:45:51 +02:00

trash.dm

…