cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Seris02
2019-12-27 18:09:30 +08:00
parent d6727bce64
commit 8ed4fe9c05
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/computer/arcade.dm
View File

@@ -67,7 +67,9 @@
/obj/item/clothing/shoes/kindleKicks = ARCADE_WEIGHT_RARE, /obj/item/clothing/shoes/kindleKicks = ARCADE_WEIGHT_RARE,
/obj/item/storage/belt/military/snack = ARCADE_WEIGHT_RARE, /obj/item/storage/belt/military/snack = ARCADE_WEIGHT_RARE,
/obj/item/clothing/mask/fakemoustache/italian = ARCADE_WEIGHT_RARE /obj/item/clothing/mask/fakemoustache/italian = ARCADE_WEIGHT_RARE,
/obj/item/clothing/suit/hooded/wintercoat/ratvar/fake = ARCADE_WEIGHT_TRICK,
/obj/item/clothing/suit/hooded/wintercoat/narsie/fake = ARCADE_WEIGHT_TRICK
) )
light_color = LIGHT_COLOR_GREEN light_color = LIGHT_COLOR_GREEN

9
code/modules/antagonists/cult/blood_magic.dm
View File

@@ -585,12 +585,11 @@
new /obj/item/stack/sheet/runed_metal(T,quantity) new /obj/item/stack/sheet/runed_metal(T,quantity)
to_chat(user, "<span class='warning'>A dark cloud emanates from you hand and swirls around the plasteel, transforming it into runed metal!</span>") to_chat(user, "<span class='warning'>A dark cloud emanates from you hand and swirls around the plasteel, transforming it into runed metal!</span>")
SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25)) SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
if(istype(target, /obj/item/clothing/suit/hooded/wintercoat)) if(istype(target, /obj/item/clothing/suit/hooded/wintercoat) && target.type != /obj/item/clothing/suit/hooded/wintercoat/narsie)
var/obj/item/clothing/suit/hooded/wintercoat/candidate = target if (do_after(user,30,target=target))
if (do_after(user,30,target=candidate))
new /obj/item/clothing/suit/hooded/wintercoat/narsie(T) new /obj/item/clothing/suit/hooded/wintercoat/narsie(T)
qdel(candidate) qdel(target)
to_chat(user, "<span class='warning'>A dark cloud emanates from you hand and swirls around the winter coat, transforming it into a narsian winter coat!</span>") to_chat(user, "<span class='warning'>A dark cloud emanates from you hand and swirls around [target], transforming it into a narsian winter coat!</span>")
SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25)) SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
else if(istype(target,/mob/living/silicon/robot)) else if(istype(target,/mob/living/silicon/robot))
var/mob/living/silicon/robot/candidate = target var/mob/living/silicon/robot/candidate = target