From 33d0839c4460fa2e2510e0df50e94f3510860c8f Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 17 Nov 2020 05:10:15 -0300 Subject: [PATCH 1/2] Typo + Early return --- hyperstation/code/obj/lunaritems.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hyperstation/code/obj/lunaritems.dm b/hyperstation/code/obj/lunaritems.dm index 1ec910e1..e2bfa45e 100644 --- a/hyperstation/code/obj/lunaritems.dm +++ b/hyperstation/code/obj/lunaritems.dm @@ -1,6 +1,6 @@ /obj/structure/lunaraltar name = "lunar altar" - desc = "Judging by the symbols, millenia ago, it seems that the creatures of this world used something precious to the icy moon that orbits this hellish planet. You... Wouldn't do that, would you?" + desc = "Judging by the symbols, millenia ago, it seems that the creatures of this world used to offer something precious to the icy moon that orbits this hellish planet. You... Wouldn't do that, would you?" icon = 'icons/obj/hand_of_god_structures.dmi' //Placeholder. icon_state = "convertaltar-blue" //Placeholder. anchored = TRUE @@ -15,6 +15,9 @@ to_chat(user, "The altar seems shattered.") return if(istype(user, /mob/living/carbon/human/)) + if(isjellyperson(user)) + to_chat(user, "You feel that there is nothing of value your species can sacrifice.") //NO SLIME CHEESE BRO + return var/part = pick("1","2","3","4") var/mob/living/carbon/human/H = user var/obj/item/bodypart/bodypart From af25a764c10d0bfcdae4792a32983b7fdfe84809 Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 17 Nov 2020 06:00:26 -0300 Subject: [PATCH 2/2] Actually let's change this --- hyperstation/code/obj/lunaritems.dm | 30 +++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/hyperstation/code/obj/lunaritems.dm b/hyperstation/code/obj/lunaritems.dm index e2bfa45e..27d82cfe 100644 --- a/hyperstation/code/obj/lunaritems.dm +++ b/hyperstation/code/obj/lunaritems.dm @@ -4,9 +4,14 @@ icon = 'icons/obj/hand_of_god_structures.dmi' //Placeholder. icon_state = "convertaltar-blue" //Placeholder. anchored = TRUE - density = FALSE + density = TRUE + light_color = LIGHT_COLOR_FIRE var/used = FALSE +/obj/structure/lunaraltar/Initialize() + . = ..() + set_light(2) + /obj/structure/lunaraltar/attack_hand(mob/living/user) . = ..() if(.) @@ -15,21 +20,23 @@ to_chat(user, "The altar seems shattered.") return if(istype(user, /mob/living/carbon/human/)) - if(isjellyperson(user)) - to_chat(user, "You feel that there is nothing of value your species can sacrifice.") //NO SLIME CHEESE BRO - return - var/part = pick("1","2","3","4") + var/part = pick("r_arm","l_arm","r_leg","l_leg") var/mob/living/carbon/human/H = user var/obj/item/bodypart/bodypart + var/paralysistype switch(part) - if("1") + if("l_leg") bodypart = H.get_bodypart(BODY_ZONE_L_LEG) - if("2") + paralysistype = TRAIT_PARALYSIS_L_LEG + if("r_leg") bodypart = H.get_bodypart(BODY_ZONE_R_LEG) - if("3") + paralysistype = TRAIT_PARALYSIS_R_LEG + if("l_arm") bodypart = H.get_bodypart(BODY_ZONE_L_ARM) - if("4") + paralysistype = TRAIT_PARALYSIS_L_ARM + if("r_arm") bodypart = H.get_bodypart(BODY_ZONE_R_ARM) + paralysistype = TRAIT_PARALYSIS_R_ARM if(!bodypart) to_chat(user, "The altar does nothing.") return @@ -42,12 +49,15 @@ "Your [bodypart] is momentarily enveloped by shadows before it's gruesomely twisted and dismembered!") bodypart.dismember() bodypart.Destroy() + ADD_TRAIT(H, paralysistype, "trauma_paralysis") + H.update_disabled_bodyparts() H.bleed_rate += 5 H.emote("scream") new /obj/item/helfiretincture(src.loc) //Eventually a pick, with different items. visible_message("As you blink, cracks appear on the altar and a flash of lunar light reaches its surface. A gift?") message_admins("[ADMIN_LOOKUPFLW(user)] has sacrificed their [bodypart] on the lunar altar at [AREACOORD(src)].") icon_state = "sacrificealtar-blue" + set_light(0) update_icon() used = TRUE @@ -55,7 +65,7 @@ name = "helfire tincture" //"Hel" not Hell. Intended. icon = 'hyperstation/icons/obj/lunar.dmi' icon_state = "helfire_tincture" - desc = "Burn everyone nearby... including you. You wouldn't do that on the shuttle now, would you?" + desc = "Burn everyone nearby... Including you." var/cooldowntime = 45 SECONDS var/used = FALSE