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

Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

Browse Source
This commit is contained in:
LetterN
2021-10-30 11:54:20 +08:00
parent 99019166e4 319c5e23fe
commit a057139c33
362 changed files with 1167 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holiday/halloween/bartholomew.dm
+1 -6
View File
@@ -8,14 +8,9 @@
anchored = TRUE
var/items_list = list()
speech_span = "spooky"
resistance_flags = INDESTRUCTIBLE
var/active = TRUE
/obj/item/barthpot/Destroy()
var/obj/item/barthpot/n = new src(loc)
n.items_list = items_list
..()
/obj/item/barthpot/attackby(obj/item/I, mob/user, params)
if(!active)
say("Meow!")
code/modules/holiday/halloween/jacqueen.dm
+7 -3
View File
@@ -65,6 +65,10 @@
cached_z = z
poof()
/mob/living/simple_animal/jacq/ComponentInitialize() //she just wants to bring halloween to the station
. = ..()
AddComponent(/datum/component/stationloving)
/mob/living/simple_animal/jacq/BiologicalLife(seconds, times_fired)
if(!(. = ..()))
return
@@ -183,7 +187,7 @@
progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_HELLO
var/choices = list("Trick", "Treat", "How do I get candies?", "Do I know you from somewhere?")
var/choice = tgui_input_list(C, "Trick or Treat?", "Trick or Treat?", choices)
var/choice = input(C, "Trick or Treat?", "Trick or Treat?") in choices
switch(choice)
if("Trick")
trick(C)
@@ -207,7 +211,7 @@
visible_message("<b>[src]</b> gives off a glowing smile, <span class='spooky'>\"What ken Ah offer ye? I can magic up an object, a potion or a plushie fer ye.\"</span>")
jacqrunes("What ken Ah offer ye? I can magic up an object, a potion or a plushie fer ye.", C)
var/choices_reward = list("Object - 3 candies", "Potion - 2 candies", "Jacqueline Tracker - 2 candies", "Plushie - 1 candy", "Can I get to know you instead?", "Become a pumpkinhead dullahan (perma) - 4 candies")
var/choice_reward = tgui_input_list(usr, "Trick or Treat?", "Trick or Treat?", choices_reward)
var/choice_reward = input(usr, "Trick or Treat?", "Trick or Treat?") in choices_reward
//rewards
switch(choice_reward)
@@ -320,7 +324,7 @@
jacqrunes("A question? Sure, it'll cost you a candy though!", C)
choices += "Nevermind"
//Candies for chitchats
var/choice = tgui_input_list(C, "What do you want to ask?", "What do you want to ask?", choices)
var/choice = input(C, "What do you want to ask?", "What do you want to ask?") in choices
if(!take_candies(C, 1))
visible_message("<b>[src]</b> raises an eyebrow, <span class='spooky'>\"It's a candy per question [gender]! Thems the rules!\"</span>")
jacqrunes("It's a candy per question [gender]! Thems the rules!", C)