From 96b9a3cbadfd8701d65236ac1e0fbdefbf88c89b Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 30 Oct 2019 18:20:13 -0700 Subject: [PATCH 1/8] makes halloween commit --- code/modules/holiday/halloween.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index 5b53499a8b3a..baf9735d8e1b 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -46,7 +46,7 @@ /obj/structure/closet/proc/set_spooky_trap() if(prob(0.1)) trapped = INSANE_CLOWN - return + returncode/modules/holiday/halloween.dm if(prob(1)) trapped = ANGRY_FAITHLESS return From 220bbb58c1e31aea3917b670c57516381b063334 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 8 Nov 2019 09:19:09 -0800 Subject: [PATCH 2/8] Update golems.dm --- .../carbon/human/species_types/golems.dm | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 6ec44fd09329..138f1febcd52 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -966,6 +966,57 @@ . = ..() target.apply_status_effect(STATUS_EFFECT_CHOKINGSTRAND) +/datum/species/golem/snow + name = "Snow Golem" + id = "snow golem" + limbs_id = "sn_golem" + fixed_mut_color = "null" //custom sprites + armor = 45 //down from 55 + burnmod = 3 //melts easily + info_text = "As a Snow Golem, you are extremely vulnerable to burn damage, but you can generate snowballs and shoot cryokinetic beams. You will also turn to snow when dying, preventing any form of recovery." + prefix = "Snow" + special_names = list("Flake", "Blizzard", "Storm") + species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES) //no mutcolors, no eye sprites + inherent_traits = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER) + + var/obj/effect/proc_holder/spell/targeted/conjure_item/snowball/ball + var/obj/effect/proc_holder/spell/aimed/cryo/cryo + +/datum/species/golem/snow/spec_death(gibbed, mob/living/carbon/human/H) + H.visible_message("[H] turns into a pile of snow!") + for(var/obj/item/W in H) + H.dropItemToGround(W) + for(var/i=1, i <= rand(3,5), i++) + new /obj/item/stack/sheet/mineral/snow(get_turf(H)) + new /obj/item/reagent_containers/food/snacks/grown/carrot(get_turf(H)) + qdel(H) + +/datum/species/golem/snow/on_species_gain(mob/living/carbon/C, datum/species/old_species) + . = ..() + C.weather_immunities |= "snow" + ball = new + ball.charge_counter = 0 + C.AddSpell(ball) + cryo = new + cryo.charge_counter = 0 + C.AddSpell(cryo) + +/datum/species/golem/snow/on_species_loss(mob/living/carbon/C) + . = ..() + C.weather_immunities -= "snow" + if(ball) + C.RemoveSpell(ball) + if(cryo) + C.RemoveSpell(cryo) + +/obj/effect/proc_holder/spell/targeted/conjure_item/snowball + name = "Snowball" + desc = "Concentrates cryokinetic forces to create snowballs, useful for throwing at people." + item_type = /obj/item/toy/snowball + charge_max = 15 + action_icon = 'icons/obj/toy.dmi' + action_icon_state = "snowball" + /datum/species/golem/bone name = "Bone Golem" id = "bone golem" From be54125db5d3d74df36ba9f6e4ccdb0dbf126728 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 8 Nov 2019 09:20:13 -0800 Subject: [PATCH 3/8] Update golems.dm --- .../carbon/human/species_types/golems.dm | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 138f1febcd52..6ec44fd09329 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -966,57 +966,6 @@ . = ..() target.apply_status_effect(STATUS_EFFECT_CHOKINGSTRAND) -/datum/species/golem/snow - name = "Snow Golem" - id = "snow golem" - limbs_id = "sn_golem" - fixed_mut_color = "null" //custom sprites - armor = 45 //down from 55 - burnmod = 3 //melts easily - info_text = "As a Snow Golem, you are extremely vulnerable to burn damage, but you can generate snowballs and shoot cryokinetic beams. You will also turn to snow when dying, preventing any form of recovery." - prefix = "Snow" - special_names = list("Flake", "Blizzard", "Storm") - species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES) //no mutcolors, no eye sprites - inherent_traits = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER) - - var/obj/effect/proc_holder/spell/targeted/conjure_item/snowball/ball - var/obj/effect/proc_holder/spell/aimed/cryo/cryo - -/datum/species/golem/snow/spec_death(gibbed, mob/living/carbon/human/H) - H.visible_message("[H] turns into a pile of snow!") - for(var/obj/item/W in H) - H.dropItemToGround(W) - for(var/i=1, i <= rand(3,5), i++) - new /obj/item/stack/sheet/mineral/snow(get_turf(H)) - new /obj/item/reagent_containers/food/snacks/grown/carrot(get_turf(H)) - qdel(H) - -/datum/species/golem/snow/on_species_gain(mob/living/carbon/C, datum/species/old_species) - . = ..() - C.weather_immunities |= "snow" - ball = new - ball.charge_counter = 0 - C.AddSpell(ball) - cryo = new - cryo.charge_counter = 0 - C.AddSpell(cryo) - -/datum/species/golem/snow/on_species_loss(mob/living/carbon/C) - . = ..() - C.weather_immunities -= "snow" - if(ball) - C.RemoveSpell(ball) - if(cryo) - C.RemoveSpell(cryo) - -/obj/effect/proc_holder/spell/targeted/conjure_item/snowball - name = "Snowball" - desc = "Concentrates cryokinetic forces to create snowballs, useful for throwing at people." - item_type = /obj/item/toy/snowball - charge_max = 15 - action_icon = 'icons/obj/toy.dmi' - action_icon_state = "snowball" - /datum/species/golem/bone name = "Bone Golem" id = "bone golem" From 443fee364073c7d690ee2a42c211e2c4bf7998e3 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 8 Nov 2019 09:39:59 -0800 Subject: [PATCH 4/8] songs --- code/modules/holiday/holidays.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 4c3859845bd5..b34199c51cba 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -502,7 +502,14 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and begin_month = DECEMBER end_day = 27 drone_hat = /obj/item/clothing/head/santa - + lobby_music = list( + "https://www.youtube.com/watch?v=v7s2VjwQSMw", // jingle bells + "https://www.youtube.com/watch?v=x2YlbiyiuMc", // Winter Wonderland + "https://www.youtube.com/watch?v=cW38y4AFGyI", // The Grinch + "https://www.youtube.com/watch?v=zgKazTrhXmI", // frosty the snowman + "https://www.youtube.com/watch?v=oyEyMjdD2uk", // twelve days of christmas + "https://www.youtube.com/watch?v=maYCStVzjDs", // deer song + ) /datum/holiday/xmas/greet() return "Have a merry Christmas!" From a773486ad3cc6a2d42f8466ca8539c3603b5d568 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Fri, 8 Nov 2019 09:41:07 -0800 Subject: [PATCH 5/8] Update holidays.dm --- code/modules/holiday/holidays.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index b34199c51cba..2a05b864278e 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -509,6 +509,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and "https://www.youtube.com/watch?v=zgKazTrhXmI", // frosty the snowman "https://www.youtube.com/watch?v=oyEyMjdD2uk", // twelve days of christmas "https://www.youtube.com/watch?v=maYCStVzjDs", // deer song + "https://www.youtube.com/watch?v=Dkq3LD-4pmM", // jolly christmas ) /datum/holiday/xmas/greet() return "Have a merry Christmas!" From 70de49539900cb79c9593c19ec199d5979c6d37e Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sun, 10 Nov 2019 15:00:10 -0800 Subject: [PATCH 6/8] Update halloween.dm --- code/modules/holiday/halloween.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index baf9735d8e1b..5b53499a8b3a 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -46,7 +46,7 @@ /obj/structure/closet/proc/set_spooky_trap() if(prob(0.1)) trapped = INSANE_CLOWN - returncode/modules/holiday/halloween.dm + return if(prob(1)) trapped = ANGRY_FAITHLESS return From b43ae6530ea2c4fab494fd422c14964df2c367c3 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 09:54:28 -0800 Subject: [PATCH 7/8] adds dsi song --- code/modules/holiday/holidays.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 2a05b864278e..9de2dc0e8880 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -510,6 +510,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and "https://www.youtube.com/watch?v=oyEyMjdD2uk", // twelve days of christmas "https://www.youtube.com/watch?v=maYCStVzjDs", // deer song "https://www.youtube.com/watch?v=Dkq3LD-4pmM", // jolly christmas + "https://www.youtube.com/watch?v=_9ePg09zV-0", // i got a brand new dsi for christmas ) /datum/holiday/xmas/greet() return "Have a merry Christmas!" From abd73a435a8575939cbe7fe4315f0eca6c770ccd Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Thu, 21 Nov 2019 18:19:28 -0800 Subject: [PATCH 8/8] removed dsi song sadly --- code/modules/holiday/holidays.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 9de2dc0e8880..a39531f5c3d8 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -509,8 +509,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and "https://www.youtube.com/watch?v=zgKazTrhXmI", // frosty the snowman "https://www.youtube.com/watch?v=oyEyMjdD2uk", // twelve days of christmas "https://www.youtube.com/watch?v=maYCStVzjDs", // deer song - "https://www.youtube.com/watch?v=Dkq3LD-4pmM", // jolly christmas - "https://www.youtube.com/watch?v=_9ePg09zV-0", // i got a brand new dsi for christmas + "https://www.youtube.com/watch?v=Dkq3LD-4pmM" // jolly christmas ) /datum/holiday/xmas/greet() return "Have a merry Christmas!"