cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-24 21:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
SandPoot
2022-02-20 21:18:57 -03:00
parent a5ba0620bf 7dde500a19
commit f3ba281d78
26 changed files with 286 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/necropolis_chests.dm
+8 -10
View File
@@ -327,7 +327,7 @@
ADD_TRAIT(user, TRAIT_NODEATH, "memento_mori")
ADD_TRAIT(user, TRAIT_NOHARDCRIT, "memento_mori")
ADD_TRAIT(user, TRAIT_NOCRITDAMAGE, "memento_mori")
icon_state = "[initial(icon_state)]_active" //modular_sand edit
icon_state = "memento_mori_active"
active_owner = user
/obj/item/clothing/neck/necklace/memento_mori/proc/mori()
@@ -695,24 +695,22 @@
/datum/reagent/flightpotion/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
var/mob/living/carbon/C = M
var/holycheck = ishumanbasic(C)
if(!(holycheck || islizard(C)) || reac_volume < 5) // implying xenohumans are holy //as with all things,
if(reac_volume < 5)
if(method == INGEST && show_message)
to_chat(C, "<span class='notice'><i>You feel nothing but a terrible aftertaste.</i></span>")
return ..()
to_chat(C, "<span class='userdanger'>A terrible pain travels down your back as wings burst out!</span>")
C.dna.species.GiveSpeciesFlight(C)
if(holycheck)
to_chat(C, "<span class='notice'>You feel blessed!</span>")
ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
var/has_wings = (C.dna.species.mutant_bodyparts["deco_wings"] && C.dna.features["deco_wings"] != "None" || C.dna.species.mutant_bodyparts["insect_wings"] && C.dna.features["insect_wings"] != "None")
var/has_functional_wings = (C.dna.species.mutant_bodyparts["wings"] != null)
to_chat(C, "<span class='userdanger'>A terrible pain travels down your back as [has_wings || has_functional_wings ? "your wings transform" : "wings burst out"]!</span>")
C.dna.species.GiveSpeciesFlight(C, has_functional_wings ? TRUE : FALSE) //give them the full list of wing choices if this is their second flight potion
to_chat(C, "<span class='notice'>You feel blessed!</span>")
ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT) //implying anyone is truly holy in a setting where people throw tantrums when things aren't violent
playsound(C.loc, 'sound/items/poster_ripped.ogg', 50, TRUE, -1)
C.adjustBruteLoss(20)
C.emote("scream")
..()
/obj/item/jacobs_ladder
name = "jacob's ladder"
desc = "A celestial ladder that violates the laws of physics."