Merge branch 'master' into master

This commit is contained in:
Thalpy
2019-06-29 15:48:25 +01:00
committed by GitHub
158 changed files with 3775 additions and 2492 deletions
+3 -3
View File
@@ -1795,10 +1795,10 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
desc = "Nothing is more terrifying than clowns with fully automatic weaponry."
item = /obj/item/storage/backpack/duffelbag/clown/syndie
/datum/uplink_item/badass/durasteel_toolbox
name = "Durasteel Toolbox"
/datum/uplink_item/badass/plastitanium_toolbox
name = "Plastitanium Toolbox"
desc = "A very high impact toolbox. Excels at destroying stationary structures."
item = /obj/item/storage/toolbox/durasteel
item = /obj/item/storage/toolbox/plastitanium
cost = 2 //18 damage on mobs, 50 on objects, 4.5 stam/hit
/datum/uplink_item/badass/balloon