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

Ugh

Browse Source
This commit is contained in:
Fermi
2019-10-09 16:32:55 +01:00
parent b023671db4
commit 3eea5310c9
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holiday/halloween/bartholomew.dm
+1 -1
View File
@@ -3,7 +3,7 @@
/obj/effect/landmark/barthpot/Initialize()
new /obj/item/barthpot(loc)
new /mob/living/simple_animal/pet/cat/jacq(loc)
new /mob/living/simple_animal/jacq(loc)
/obj/item/barthpot
name = "Bartholomew"
code/modules/holiday/halloween/jacqueen.dm
+16 -17
View File
@@ -10,7 +10,7 @@
/////// MOBS
//Whacha doing in here like? Yae wan tae ruin ta magicks?
/mob/living/simple_animal/pet/cat/jacq
/mob/living/simple_animal/jacq
name = "Jacqueline the Pumpqueen"
real_name = "Jacqueline"
icon = 'icons/obj/halloween_items.dmi'
@@ -20,32 +20,31 @@
density = FALSE
var/progression = list() //Keep track of where people are in the story.
/mob/living/simple_animal/pet/cat/jacq/Initialize()
/mob/living/simple_animal/jacq/Initialize()
poof()
/mob/living/simple_animal/pet/cat/jacq/Destroy() //I.e invincible
/mob/living/simple_animal/jacq/Destroy() //I.e invincible
visible_message("<b>[src]</b> cackles, <span class='spooky'>\"You'll nae get rid a me that easily!\"</span>")
playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 1)
var/mob/living/simple_animal/pet/cat/jacq/Jacq = new src.type(loc)
Jacq.tricked = tricked
var/mob/living/simple_animal/jacq/Jacq = new src.type(loc)
Jacq.progression = progression
..()
/mob/living/simple_animal/pet/cat/jacq/death() //What is alive may never die
/mob/living/simple_animal/jacq/death() //What is alive may never die
visible_message("<b>[src]</b> cackles, <span class='spooky'>\"You'll nae get rid a me that easily!\"</span>")
playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 1)
health = 20
poof()
/mob/living/simple_animal/pet/cat/jacq/attack_hand(mob/living/carbon/human/M)
/mob/living/simple_animal/jacq/attack_hand(mob/living/carbon/human/M)
chit_chat(M)
..()
/mob/living/simple_animal/pet/cat/jacq/attack_paw(mob/living/carbon/monkey/M)
/mob/living/simple_animal/jacq/attack_paw(mob/living/carbon/monkey/M)
chit_chat(M)
..()
/mob/living/simple_animal/pet/cat/jacq/proc/poof()
/mob/living/simple_animal/jacq/proc/poof()
var/datum/reagents/R = new/datum/reagents(100)//Hey, just in case.
var/datum/effect_system/smoke_spread/chem/s = new()
R.add_reagent("secretcatchem", (10))
@@ -64,7 +63,7 @@
return FALSE
//Ye wee bugger, gerrout of it. Ye've nae tae enjoy reading the code fer mae secrets like.
/mob/living/simple_animal/pet/cat/jacq/proc/chit_chat(mob/living/carbon/C)
/mob/living/simple_animal/jacq/proc/chit_chat(mob/living/carbon/C)
//Very important
var/gender = "lamb"
if(C)
@@ -74,9 +73,9 @@
gender = "lassie"
if(!progression["[C.real_name]"] || !(progression["[C.real_name]"] & JACQ_HELLO))
visible_message("<b>[src] smiles ominously at [L],</b> <span class='spooky'>\"Well halo there [gender]! Ah'm Jacqueline, tae great Pumpqueen, great tae meet ye.\"</span>")
visible_message("<b>[src] smiles ominously at [C],</b> <span class='spooky'>\"Well halo there [gender]! Ah'm Jacqueline, tae great Pumpqueen, great tae meet ye.\"</span>")
sleep(20)
visible_message("<span class='spooky'><b>[src] continues,</b> says, \"Ah'm sure yae well stunned, but ah've got nae taem fer that. Ah'm after the candies around this station. If yae get mae enoof o the wee buggers, Ah'll give ye a treat, or if yae feeling bold, Ah ken trick ye instead.</span>\" giving [L] a wide grin.")
visible_message("<span class='spooky'><b>[src] continues,</b> says, \"Ah'm sure yae well stunned, but ah've got nae taem fer that. Ah'm after the candies around this station. If yae get mae enoof o the wee buggers, Ah'll give ye a treat, or if yae feeling bold, Ah ken trick ye instead.</span>\" giving [C] a wide grin.")
if(!progression["[C.real_name]"])
progression["[C.real_name]"] += JACQ_HELLO //TO MAKE SURE THAT THE LIST ENTRY EXISTS.
else
@@ -98,7 +97,7 @@
visible_message("<b>[src] says,</b> <span class='spooky'>\"Gae find my familiar; Bartholomew. Ee's tendin the cauldron which ken bring oot t' magic energy in items scattered aroond. Knowing him, ee's probably gone tae somewhere with books.\"</span>")
return
/mob/living/simple_animal/pet/cat/jacq/proc/treat(mob/living/carbon/C, gender)
/mob/living/simple_animal/jacq/proc/treat(mob/living/carbon/C, gender)
visible_message("<b>[src] gives off a glowing smile,</b> <span class='spooky'>\"What ken Ah offer ye? I can magic up an object, a potion or a plushie fer ye.\"</span>")
var/choices_reward = list("Object - 3 candies", "Potion - 2 candies", "Plushie - 1 candy", "Can I ask you a question instead?")
var/choice_reward = input(usr, "Trick or Treat?", "Trick or Treat?") in choices_reward
@@ -207,7 +206,7 @@
visible_message("<b>[src] shurgs,</b> <span class='spooky'>\"Suit yerself then.\"</span>")
/mob/living/simple_animal/pet/cat/jacq/proc/trick(mob/living/carbon/C, gender)
/mob/living/simple_animal/jacq/proc/trick(mob/living/carbon/C, gender)
var/option
if(ishuman(C))
option = rand(1,7)
@@ -258,7 +257,7 @@
poof()
//Blame Fel
/mob/living/simple_animal/pet/cat/jacq/proc/dating_start(mob/living/carbon/C, gender)
/mob/living/simple_animal/jacq/proc/dating_start(mob/living/carbon/C, gender)
var/candies = pollGhostCandidates("Do you want to go on a date with [C] as Jacqueline the great pumpqueen?")
//sleep(30) //If the poll doesn't autopause.
if(candies)
@@ -319,7 +318,7 @@ var/datum/reagent/mutationtoxin/pumpkinhead
mutationtext = "<span class='spooky'>The pain subsides. You feel your head roll off your shoulders."
//I couldn't get the replace head sprite with a pumpkin to work so, it is what it is.
/mob/living/simple_animal/pet/cat/jacq/proc/check_candies(mob/living/carbon/C)
/mob/living/simple_animal/jacq/proc/check_candies(mob/living/carbon/C)
var/invs = C.get_contents()
var/candy_count = 0
for(var/item in invs)
@@ -327,7 +326,7 @@ var/datum/reagent/mutationtoxin/pumpkinhead
candy_count++
return candy_count
/mob/living/simple_animal/pet/cat/jacq/proc/take_candies(mob/living/carbon/C, candy_amount = 1)
/mob/living/simple_animal/jacq/proc/take_candies(mob/living/carbon/C, candy_amount = 1)
var/inv = C.get_contents()
var/candies = list()
for(var/item in inv)