[MIRROR] Pens and iron rods can embed again (#3670)

* Pens and iron rods can embed again (#57181)

* Pens and iron rods can embed again

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-02-26 15:17:03 +01:00
committed by GitHub
parent 8d1649390f
commit 8aee19fce6
4 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -463,7 +463,7 @@
shard.embedding = list(embed_chance = 100, ignore_throwspeed_threshold = TRUE, impact_pain_mult=3, pain_chance=5)
shard.updateEmbedding()
user.hitby(shard, skipcatch = TRUE, hitpush = FALSE)
shard.embedding = list()
shard.embedding = null
shard.updateEmbedding()
W.obj_destruction()
user.adjustStaminaLoss(10 * speed)
+1
View File
@@ -998,6 +998,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
///For when you want to add/update the embedding on an item. Uses the vars in [/obj/item/var/embedding], and defaults to config values for values that aren't set. Will automatically detach previous embed elements on this item.
/obj/item/proc/updateEmbedding()
if(!LAZYLEN(embedding))
disableEmbedding()
return
AddElement(/datum/element/embed,\
+1 -1
View File
@@ -25,7 +25,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
attack_verb_continuous = list("hits", "bludgeons", "whacks")
attack_verb_simple = list("hit", "bludgeon", "whack")
hitsound = 'sound/weapons/gun/general/grenade_launch.ogg'
embedding = list()
embedding = list(embed_chance = 50)
novariants = TRUE
matter_amount = 2
cost = 250
+1 -1
View File
@@ -28,7 +28,7 @@
var/colour = "black" //what colour the ink is!
var/degrees = 0
var/font = PEN_FONT
embedding = list()
embedding = list(embed_chance = 50)
sharpness = SHARP_POINTY
/obj/item/pen/suicide_act(mob/user)