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/7] 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/7] 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/7] 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 e4215e7e7cdfc80548b7fb9c1ea61855dc26355b Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Thu, 14 Nov 2019 22:50:07 -0800 Subject: [PATCH 4/7] haahhhaha --- yogstation/icons/obj/weapons.dmi | Bin 0 -> 1014 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 yogstation/icons/obj/weapons.dmi diff --git a/yogstation/icons/obj/weapons.dmi b/yogstation/icons/obj/weapons.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3921e333932fb7efe4bc256c31acdb1b537f32ad GIT binary patch literal 1014 zcmVV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#GBiV`b}Gcr?iQk1wjQ!Jp@xj55`5_3}_Y`D_mjKsWb zT&k26T>V@WTzoyb01)XW_cdE4;{X5yG)Y83RA_$p* zk^mR|hlS7gYt+Zb$G5Gksw&_f5q1HO;ID!Q%%aLD610xX(gZxVf{LA~|1T{8zvO--RF3N=Wa_+f|rG&C}^67 z*Xt!7kE3ZCm6etBb~IH-A`#A>4%q(ia!m@fox3d!47Lh@{QUgiQbE^sdb&p)eRaA< z0ASNeQwUQ8r_O^*x57Q$qf$H`-?j5#BLY-awe&@}^-$zbv0KMYvPQt&I}6g>+??a} zJsb{m_s)X5PlQsBzg1Obd3kx;y15$tz2yI)=>KDJ8+U`77bCvR7b7z>GaT59kyH-S k)tDmz4ic{12<;_50eMqf4RD+>5C8xG07*qoM6N<$f>7qtc>n+a literal 0 HcmV?d00001 From bacafc299c35aeaa0861490e3acd98b060106b8d Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 20 Nov 2019 08:56:19 -0800 Subject: [PATCH 5/7] Update necropolis_chests.dm --- code/modules/mining/lavaland/necropolis_chests.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 7375d1f4a2b4..288adcf67e1c 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -28,7 +28,7 @@ if(6) new /obj/item/reagent_containers/glass/bottle/potion/flight(src) if(7) - new /obj/item/pickaxe/diamond(src) + new /obj/item/stack/sheet/mineral/mythril(src) if(8) if(prob(50)) new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) From bb4747d65ed9f3a86bbc5e2dd15d63b597952892 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 20 Nov 2019 09:08:07 -0800 Subject: [PATCH 6/7] 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 ef046b6960cfb5d10a8d20723099c5d8ded59b66 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Thu, 21 Nov 2019 20:23:42 -0800 Subject: [PATCH 7/7] Delete weapons.dmi --- yogstation/icons/obj/weapons.dmi | Bin 1014 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 yogstation/icons/obj/weapons.dmi diff --git a/yogstation/icons/obj/weapons.dmi b/yogstation/icons/obj/weapons.dmi deleted file mode 100644 index 3921e333932fb7efe4bc256c31acdb1b537f32ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1014 zcmVV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#GBiV`b}Gcr?iQk1wjQ!Jp@xj55`5_3}_Y`D_mjKsWb zT&k26T>V@WTzoyb01)XW_cdE4;{X5yG)Y83RA_$p* zk^mR|hlS7gYt+Zb$G5Gksw&_f5q1HO;ID!Q%%aLD610xX(gZxVf{LA~|1T{8zvO--RF3N=Wa_+f|rG&C}^67 z*Xt!7kE3ZCm6etBb~IH-A`#A>4%q(ia!m@fox3d!47Lh@{QUgiQbE^sdb&p)eRaA< z0ASNeQwUQ8r_O^*x57Q$qf$H`-?j5#BLY-awe&@}^-$zbv0KMYvPQt&I}6g>+??a} zJsb{m_s)X5PlQsBzg1Obd3kx;y15$tz2yI)=>KDJ8+U`77bCvR7b7z>GaT59kyH-S k)tDmz4ic{12<;_50eMqf4RD+>5C8xG07*qoM6N<$f>7qtc>n+a