Merge remote-tracking branch 'citadel/master' into combat_v7

This commit is contained in:
silicons
2021-06-13 15:37:35 -07:00
180 changed files with 78539 additions and 75395 deletions
@@ -266,6 +266,8 @@
desc = "A wooden rod about the size of your forearm with a snake carved around it, winding it's way up the sides of the rod. Something about it seems to inspire in you the responsibilty and duty to help others."
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "asclepius_dormant"
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
var/activated = FALSE
var/usedHand
+2
View File
@@ -11,6 +11,8 @@
/obj/item/storage/bag/money/Initialize()
. = ..()
if(prob(20))
icon_state = "moneybagalt"
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.max_items = 40