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

should be ready.

Browse Source
This commit is contained in:
Ghommie
2019-06-06 19:24:20 +02:00
parent 44358e054a
commit d3d2b8d898
168 changed files with 444 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/nanites/nanite_programs/buffing.dm
+4 -4
View File
@@ -106,11 +106,11 @@
/datum/nanite_program/conductive/enable_passive_effect()
. = ..()
host_mob.add_trait(TRAIT_SHOCKIMMUNE, "nanites")
ADD_TRAIT(host_mob, TRAIT_SHOCKIMMUNE, "nanites")
/datum/nanite_program/conductive/disable_passive_effect()
. = ..()
host_mob.remove_trait(TRAIT_SHOCKIMMUNE, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_SHOCKIMMUNE, "nanites")
/datum/nanite_program/mindshield
name = "Mental Barrier"
@@ -121,10 +121,10 @@
/datum/nanite_program/mindshield/enable_passive_effect()
. = ..()
if(!host_mob.mind.has_antag_datum(/datum/antagonist/rev)) //won't work if on a rev, to avoid having implanted revs
host_mob.add_trait(TRAIT_MINDSHIELD, "nanites")
ADD_TRAIT(host_mob, TRAIT_MINDSHIELD, "nanites")
host_mob.sec_hud_set_implants()
/datum/nanite_program/mindshield/disable_passive_effect()
. = ..()
host_mob.remove_trait(TRAIT_MINDSHIELD, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_MINDSHIELD, "nanites")
host_mob.sec_hud_set_implants()
code/modules/research/nanites/nanite_programs/healing.dm
+1 -1
View File
@@ -215,7 +215,7 @@
if(!iscarbon(host_mob)) //nonstandard biology
return FALSE
var/mob/living/carbon/C = host_mob
if(C.suiciding || C.has_trait(TRAIT_NOCLONE) || C.hellbound) //can't revive
if(C.suiciding || HAS_TRAIT(C, TRAIT_NOCLONE) || C.hellbound) //can't revive
return FALSE
if((world.time - C.timeofdeath) > 1800) //too late
return FALSE
code/modules/research/nanites/nanite_programs/suppression.dm
+4 -4
View File
@@ -65,11 +65,11 @@
/datum/nanite_program/pacifying/enable_passive_effect()
. = ..()
host_mob.add_trait(TRAIT_PACIFISM, "nanites")
ADD_TRAIT(host_mob, TRAIT_PACIFISM, "nanites")
/datum/nanite_program/pacifying/disable_passive_effect()
. = ..()
host_mob.remove_trait(TRAIT_PACIFISM, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_PACIFISM, "nanites")
/datum/nanite_program/blinding
name = "Blindness"
@@ -93,11 +93,11 @@
/datum/nanite_program/mute/enable_passive_effect()
. = ..()
host_mob.add_trait(TRAIT_MUTE, "nanites")
ADD_TRAIT(host_mob, TRAIT_MUTE, "nanites")
/datum/nanite_program/mute/disable_passive_effect()
. = ..()
host_mob.remove_trait(TRAIT_MUTE, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_MUTE, "nanites")
/datum/nanite_program/fake_death
name = "Death Simulation"
code/modules/research/xenobiology/crossbreeding/_clothing.dm
+4 -4
View File
@@ -20,14 +20,14 @@ Slimecrossing Armor
/obj/item/clothing/mask/nobreath/equipped(mob/living/carbon/human/user, slot)
. = ..()
if(slot == SLOT_WEAR_MASK)
user.add_trait(TRAIT_NOBREATH, "breathmask_[REF(src)]")
ADD_TRAIT(user, TRAIT_NOBREATH, "breathmask_[REF(src)]")
user.failed_last_breath = FALSE
user.clear_alert("not_enough_oxy")
user.apply_status_effect(/datum/status_effect/rebreathing)
/obj/item/clothing/mask/nobreath/dropped(mob/living/carbon/human/user)
..()
user.remove_trait(TRAIT_NOBREATH, "breathmask_[REF(src)]")
REMOVE_TRAIT(user, TRAIT_NOBREATH, "breathmask_[REF(src)]")
user.remove_status_effect(/datum/status_effect/rebreathing)
/obj/item/clothing/glasses/prism_glasses
@@ -112,11 +112,11 @@ Slimecrossing Armor
/obj/item/clothing/head/peaceflower/equipped(mob/living/carbon/human/user, slot)
. = ..()
if(slot == SLOT_HEAD)
user.add_trait(TRAIT_PACIFISM, "peaceflower_[REF(src)]")
ADD_TRAIT(user, TRAIT_PACIFISM, "peaceflower_[REF(src)]")
/obj/item/clothing/head/peaceflower/dropped(mob/living/carbon/human/user)
..()
user.remove_trait(TRAIT_PACIFISM, "peaceflower_[REF(src)]")
REMOVE_TRAIT(user, TRAIT_PACIFISM, "peaceflower_[REF(src)]")
/obj/item/clothing/head/peaceflower/attack_hand(mob/user)
if(iscarbon(user))
code/modules/research/xenobiology/crossbreeding/_misc.dm
+1 -1
View File
@@ -56,7 +56,7 @@
if(last_check_time + 50 < world.time)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.mind && !H.has_trait(TRAIT_AGEUSIA))
if(H.mind && !HAS_TRAIT(H, TRAIT_AGEUSIA))
to_chat(H,"<span class='notice'>That didn't taste very good...</span>") //No disgust, though. It's just not good tasting.
GET_COMPONENT_FROM(mood, /datum/component/mood, H)
if(mood)
code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+16 -16
View File
@@ -11,7 +11,7 @@
/datum/status_effect/rainbow_protection/on_apply()
owner.status_flags |= GODMODE
owner.add_trait(TRAIT_PACIFISM, "slimestatus")
ADD_TRAIT(owner, TRAIT_PACIFISM, "slimestatus")
owner.visible_message("<span class='warning'>[owner] shines with a brilliant rainbow light.</span>",
"<span class='notice'>You feel protected by an unknown force!</span>")
originalcolor = owner.color
@@ -24,7 +24,7 @@
/datum/status_effect/rainbow_protection/on_remove()
owner.status_flags &= ~GODMODE
owner.color = originalcolor
owner.remove_trait(TRAIT_PACIFISM, "slimestatus")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "slimestatus")
owner.visible_message("<span class='notice'>[owner] stops glowing, the rainbow light fading away.</span>",
"<span class='warning'>You no longer feel protected...</span>")
@@ -246,12 +246,12 @@ datum/status_effect/rebreathing/tick()
duration = 100
/datum/status_effect/firecookie/on_apply()
owner.add_trait(TRAIT_RESISTCOLD,"firecookie")
ADD_TRAIT(owner, TRAIT_RESISTCOLD,"firecookie")
owner.adjust_bodytemperature(110)
return ..()
/datum/status_effect/firecookie/on_remove()
owner.remove_trait(TRAIT_RESISTCOLD,"firecookie")
REMOVE_TRAIT(owner, TRAIT_RESISTCOLD,"firecookie")
/datum/status_effect/watercookie
id = "watercookie"
@@ -260,7 +260,7 @@ datum/status_effect/rebreathing/tick()
duration = 100
/datum/status_effect/watercookie/on_apply()
owner.add_trait(TRAIT_NOSLIPWATER,"watercookie")
ADD_TRAIT(owner, TRAIT_NOSLIPWATER,"watercookie")
return ..()
/datum/status_effect/watercookie/tick()
@@ -268,7 +268,7 @@ datum/status_effect/rebreathing/tick()
T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5)
/datum/status_effect/watercookie/on_remove()
owner.remove_trait(TRAIT_NOSLIPWATER,"watercookie")
REMOVE_TRAIT(owner, TRAIT_NOSLIPWATER,"watercookie")
/datum/status_effect/metalcookie
id = "metalcookie"
@@ -313,11 +313,11 @@ datum/status_effect/rebreathing/tick()
duration = 600
/datum/status_effect/toxincookie/on_apply()
owner.add_trait(TRAIT_TOXINLOVER,"toxincookie")
ADD_TRAIT(owner, TRAIT_TOXINLOVER,"toxincookie")
return ..()
/datum/status_effect/toxincookie/on_remove()
owner.remove_trait(TRAIT_TOXINLOVER,"toxincookie")
REMOVE_TRAIT(owner, TRAIT_TOXINLOVER,"toxincookie")
/datum/status_effect/timecookie
id = "timecookie"
@@ -417,11 +417,11 @@ datum/status_effect/rebreathing/tick()
duration = 30
/datum/status_effect/plur/on_apply()
owner.add_trait(TRAIT_PACIFISM, "peacecookie")
ADD_TRAIT(owner, TRAIT_PACIFISM, "peacecookie")
return ..()
/datum/status_effect/plur/on_remove()
owner.remove_trait(TRAIT_PACIFISM, "peacecookie")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "peacecookie")
/datum/status_effect/adamantinecookie
id = "adamantinecookie"
@@ -515,11 +515,11 @@ datum/status_effect/rebreathing/tick()
colour = "blue"
/datum/status_effect/stabilized/blue/on_apply()
owner.add_trait(TRAIT_NOSLIPWATER, "slimestatus")
ADD_TRAIT(owner, TRAIT_NOSLIPWATER, "slimestatus")
return ..()
datum/status_effect/stabilized/blue/on_remove()
owner.remove_trait(TRAIT_NOSLIPWATER, "slimestatus")
REMOVE_TRAIT(owner, TRAIT_NOSLIPWATER, "slimestatus")
/datum/status_effect/stabilized/metal
id = "stabilizedmetal"
@@ -580,7 +580,7 @@ datum/status_effect/stabilized/blue/on_remove()
examine_text = "<span class='notice'>Their fingertips burn brightly!</span>"
/datum/status_effect/stabilized/darkpurple/on_apply()
owner.add_trait(TRAIT_RESISTHEATHANDS, "slimestatus")
ADD_TRAIT(owner, TRAIT_RESISTHEATHANDS, "slimestatus")
fire = new(owner)
return ..()
@@ -596,7 +596,7 @@ datum/status_effect/stabilized/blue/on_remove()
return ..()
/datum/status_effect/stabilized/darkpurple/on_remove()
owner.remove_trait(TRAIT_RESISTHEATHANDS, "slimestatus")
REMOVE_TRAIT(owner, TRAIT_RESISTHEATHANDS, "slimestatus")
qdel(fire)
/datum/status_effect/stabilized/darkblue
@@ -916,7 +916,7 @@ datum/status_effect/stabilized/blue/on_remove()
colour = "light pink"
/datum/status_effect/stabilized/lightpink/on_apply()
owner.add_trait(TRAIT_GOTTAGOFAST,"slimestatus")
ADD_TRAIT(owner, TRAIT_GOTTAGOFAST,"slimestatus")
return ..()
/datum/status_effect/stabilized/lightpink/tick()
@@ -927,7 +927,7 @@ datum/status_effect/stabilized/blue/on_remove()
return ..()
/datum/status_effect/stabilized/lightpink/on_remove()
owner.remove_trait(TRAIT_GOTTAGOFAST,"slimestatus")
REMOVE_TRAIT(owner, TRAIT_GOTTAGOFAST,"slimestatus")
/datum/status_effect/stabilized/adamantine
id = "stabilizedadamantine"
code/modules/research/xenobiology/crossbreeding/charged.dm
+1 -1
View File
@@ -427,7 +427,7 @@ Charged extracts:
else
to_chat(user, "<span class='warning'>You drink the pacification potion!</span>")
if(isanimal(M))
M.add_trait(TRAIT_PACIFISM, MAGIC_TRAIT)
ADD_TRAIT(M, TRAIT_PACIFISM, MAGIC_TRAIT)
else if(iscarbon(M))
var/mob/living/carbon/C = M
C.gain_trauma(/datum/brain_trauma/severe/pacifism, TRAUMA_RESILIENCE_SURGERY)