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

Update files

Browse Source
This commit is contained in:
SandPoot
2022-04-06 18:41:31 -03:00
parent 4c3fa08cdf
commit 586a035132
881 changed files with 1599 additions and 1599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holiday/easter.dm
+2 -2
View File
@@ -66,7 +66,7 @@
icon = 'icons/mob/easter.dmi'
icon_state = "basket"
/obj/item/storage/bag/easterbasket/Initialize()
/obj/item/storage/bag/easterbasket/Initialize(mapload)
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/chocolateegg, /obj/item/reagent_containers/food/snacks/boiledegg))
@@ -109,7 +109,7 @@
/obj/item/reagent_containers/food/snacks/egg/loaded
containsPrize = TRUE
/obj/item/reagent_containers/food/snacks/egg/loaded/Initialize()
/obj/item/reagent_containers/food/snacks/egg/loaded/Initialize(mapload)
. = ..()
var/eggcolor = pick("blue","green","mime","orange","purple","rainbow","red","yellow")
icon_state = "egg-[eggcolor]"
code/modules/holiday/halloween/halloween.dm
+5 -5
View File
@@ -42,7 +42,7 @@
var/trapped = 0
var/mob/trapped_mob
/obj/structure/closet/Initialize()
/obj/structure/closet/Initialize(mapload)
..()
if(prob(30))
set_spooky_trap()
@@ -137,7 +137,7 @@
layer = 4
var/timer = 0
/mob/living/simple_animal/hostile/construct/shade/howling_ghost/Initialize()
/mob/living/simple_animal/hostile/construct/shade/howling_ghost/Initialize(mapload)
. = ..()
icon_state = pick("ghost","ghostian","ghostian2","ghostking","ghost1","ghost2")
icon_living = icon_state
@@ -196,7 +196,7 @@
unsuitable_atmos_damage = 0
var/timer
/mob/living/simple_animal/hostile/retaliate/clown/insane/Initialize()
/mob/living/simple_animal/hostile/retaliate/clown/insane/Initialize(mapload)
. = ..()
timer = rand(5,15)
@@ -233,7 +233,7 @@
return
/mob/living/simple_animal/hostile/retaliate/clown/insane/adjustHealth()
. = ..()
. = ..()
if(prob(5))
playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1)
@@ -281,7 +281,7 @@
var/obj/effect/wisp/pumpkin/wisp2
//Hoooo boy that's some wild code there.
/obj/item/wisp_lantern/pumpkin/Initialize()
/obj/item/wisp_lantern/pumpkin/Initialize(mapload)
. = ..()
qdel(wisp)
wisp2 = new(src)
code/modules/holiday/halloween/jacqueen.dm
+5 -5
View File
@@ -61,7 +61,7 @@
/atom/movable/screen
))
/mob/living/simple_animal/jacq/Initialize()
/mob/living/simple_animal/jacq/Initialize(mapload)
. = ..() //fuck you jacq, return a hint you shit
cached_z = z
poof()
@@ -664,13 +664,13 @@
hat_type = "pumpkin_j"
brightness_on = 4
/obj/item/clothing/head/hardhat/pumpkinhead/jaqc/Initialize()
/obj/item/clothing/head/hardhat/pumpkinhead/jaqc/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, GLUED_ITEM_TRAIT)
/obj/item/clothing/suit/ghost_sheet/sticky
/obj/item/clothing/suit/ghost_sheet/sticky/Initialize()
/obj/item/clothing/suit/ghost_sheet/sticky/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, GLUED_ITEM_TRAIT)
@@ -723,7 +723,7 @@
icon_state = "jacq_potion"
desc = "A potion with a strange concoction within. Be careful, as if it's thrown it explodes in a puff of smoke like Jacqueline."
/obj/item/reagent_containers/potion_container/Initialize()
/obj/item/reagent_containers/potion_container/Initialize(mapload)
.=..()
var/R = get_random_reagent_id()
reagents.add_reagent(R, 30)
@@ -748,6 +748,6 @@
icon_state = "jacq_candy"
desc = "A candy with strange magic within. Be careful, as the magic isn't always helpful."
/obj/item/reagent_containers/food/snacks/special_candy/Initialize()
/obj/item/reagent_containers/food/snacks/special_candy/Initialize(mapload)
.=..()
reagents.add_reagent(get_random_reagent_id(), 5)