shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] A Nar-Sie Plushie can be used an an extra invoker now! (#5723)

Browse Source 
* A Nar-Sie Plushie can be used an an extra invoker now! (#35932)

* A Nar-Sie Plushie can be used an an extra invoker now!

you can't use 9 nar-sie plushies to invoke a rune, nar-sie plushies are only counted once

* Update runes.dm

* Update plushes.dm

* Update plushes.dm

* Update runes.dm

* A Nar-Sie Plushie can be used an an extra invoker now!
This commit is contained in:
CitadelStationBot
2018-02-27 05:03:07 -06:00
committed by Poojawa
parent b7d616250d
commit f7ade14cf7
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/objects/items/plushes.dm
View File

@@ -462,9 +462,10 @@
/obj/item/toy/plush/narplush
name = "nar'sie plushie"
desc = "A small stuffed doll of the elder god nar'sie. Who thought this was a good children's toy?"
desc = "A small stuffed doll of the elder god Nar'Sie. Who thought this was a good children's toy?"
icon_state = "narplush"
var/clashing
var/is_invoker = TRUE
gender = FEMALE //it's canon if the toy is
/obj/item/toy/plush/narplush/Moved()
@@ -473,6 +474,10 @@
if(P && istype(P.loc, /turf/open) && !P.clash_target && !clashing)
P.clash_of_the_plushies(src)
/obj/item/toy/plush/narplush/hugbox
desc = "A small stuffed doll of the elder god Nar'Sie. Who thought this was a good children's toy? <b>It looks sad.</b>"
is_invoker = FALSE
/obj/item/toy/plush/lizardplushie
name = "lizard plushie"
desc = "An adorable stuffed toy that resembles a lizardperson."
@@ -504,4 +509,4 @@
item_state = "plushie_slime"
attack_verb = list("blorbled", "slimed", "absorbed")
squeak_override = list('sound/effects/blobattack.ogg' = 1)
gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy

23
code/modules/antagonists/cult/runes.dm
View File

@@ -113,8 +113,13 @@ structure_check() searches for nearby cultist structures required for the invoca
if(user)
chanters += user
invokers += user
if(req_cultists > 1 || allow_excess_invokers)
for(var/mob/living/L in range(1, src))
var/list/things_in_range = range(1, src)
var/obj/item/toy/plush/narplush/plushsie = locate() in things_in_range
if(istype(plushsie) && plushsie.is_invoker)
invokers += plushsie
for(var/mob/living/L in things_in_range)
if(iscultist(L))
if(L == user)
continue
@@ -140,12 +145,16 @@ structure_check() searches for nearby cultist structures required for the invoca
/obj/effect/rune/proc/invoke(var/list/invokers)
//This proc contains the effects of the rune as well as things that happen afterwards. If you want it to spawn an object and then delete itself, have both here.
for(var/M in invokers)
var/mob/living/L = M
if(invocation)
L.say(invocation, language = /datum/language/common, ignore_spam = TRUE)
if(invoke_damage)
L.apply_damage(invoke_damage, BRUTE)
to_chat(L, "<span class='cult italic'>[src] saps your strength!</span>")
if(isliving(M))
var/mob/living/L = M
if(invocation)
L.say(invocation, language = /datum/language/common, ignore_spam = TRUE)
if(invoke_damage)
L.apply_damage(invoke_damage, BRUTE)
to_chat(L, "<span class='cult italic'>[src] saps your strength!</span>")
else if(istype(M, /obj/item/toy/plush/narplush))
var/obj/item/toy/plush/narplush/P = M
P.visible_message("<span class='cult italic'>[P] squeaks loudly!</span>")
do_invoke_glow()
/obj/effect/rune/proc/do_invoke_glow()