cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Defines some traits and cleans it out a little (#3873)

Browse Source 
* Defines some traits and cleans it out a little

* Update stunbaton.dm

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-03-04 21:57:43 +00:00
committed by GitHub
co-authored by John Willard Gandalf2k15
parent 2fe94d7263
commit 9268949ce0
19 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/necropolis_chests.dm
+3 -3
View File
@@ -237,9 +237,9 @@
to_chat(user, "<span class='warning'>You feel your life being drained by the pendant...</span>")
if(do_after(user, 40, target = user))
to_chat(user, "<span class='notice'>Your lifeforce is now linked to the pendant! You feel like removing it would kill you, and yet you instinctively know that until then, you won't die.</span>")
ADD_TRAIT(user, TRAIT_NODEATH, "memento_mori")
ADD_TRAIT(user, TRAIT_NOHARDCRIT, "memento_mori")
ADD_TRAIT(user, TRAIT_NOCRITDAMAGE, "memento_mori")
ADD_TRAIT(user, TRAIT_NODEATH, CLOTHING_TRAIT)
ADD_TRAIT(user, TRAIT_NOHARDCRIT, CLOTHING_TRAIT)
ADD_TRAIT(user, TRAIT_NOCRITDAMAGE, CLOTHING_TRAIT)
icon_state = "memento_mori_active"
active_owner = user
code/modules/surgery/advanced/bioware/cortex_folding.dm
+2 -2
View File
@@ -53,8 +53,8 @@
/datum/bioware/cortex_fold/on_gain()
. = ..()
ADD_TRAIT(owner, TRAIT_SPECIAL_TRAUMA_BOOST, "cortex_fold")
ADD_TRAIT(owner, TRAIT_SPECIAL_TRAUMA_BOOST, EXPERIMENTAL_SURGERY_TRAIT)
/datum/bioware/cortex_fold/on_lose()
REMOVE_TRAIT(owner, TRAIT_SPECIAL_TRAUMA_BOOST, "cortex_fold")
REMOVE_TRAIT(owner, TRAIT_SPECIAL_TRAUMA_BOOST, EXPERIMENTAL_SURGERY_TRAIT)
return ..()
code/modules/surgery/advanced/bioware/ligament_hook.dm
+4 -4
View File
@@ -36,10 +36,10 @@
/datum/bioware/hooked_ligaments/on_gain()
..()
ADD_TRAIT(owner, TRAIT_LIMBATTACHMENT, "ligament_hook")
ADD_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook")
ADD_TRAIT(owner, TRAIT_LIMBATTACHMENT, EXPERIMENTAL_SURGERY_TRAIT)
ADD_TRAIT(owner, TRAIT_EASYDISMEMBER, EXPERIMENTAL_SURGERY_TRAIT)
/datum/bioware/hooked_ligaments/on_lose()
..()
REMOVE_TRAIT(owner, TRAIT_LIMBATTACHMENT, "ligament_hook")
REMOVE_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook")
REMOVE_TRAIT(owner, TRAIT_LIMBATTACHMENT, EXPERIMENTAL_SURGERY_TRAIT)
REMOVE_TRAIT(owner, TRAIT_EASYDISMEMBER, EXPERIMENTAL_SURGERY_TRAIT)
code/modules/surgery/advanced/bioware/ligament_reinforcement.dm
+4 -4
View File
@@ -36,10 +36,10 @@
/datum/bioware/reinforced_ligaments/on_gain()
..()
ADD_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments")
ADD_TRAIT(owner, TRAIT_EASILY_WOUNDED, "reinforced_ligaments")
ADD_TRAIT(owner, TRAIT_NODISMEMBER, EXPERIMENTAL_SURGERY_TRAIT)
ADD_TRAIT(owner, TRAIT_EASILY_WOUNDED, EXPERIMENTAL_SURGERY_TRAIT)
/datum/bioware/reinforced_ligaments/on_lose()
..()
REMOVE_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments")
REMOVE_TRAIT(owner, TRAIT_EASILY_WOUNDED, "reinforced_ligaments")
REMOVE_TRAIT(owner, TRAIT_NODISMEMBER, EXPERIMENTAL_SURGERY_TRAIT)
REMOVE_TRAIT(owner, TRAIT_EASILY_WOUNDED, EXPERIMENTAL_SURGERY_TRAIT)
code/modules/surgery/advanced/bioware/muscled_veins.dm
+2 -2
View File
@@ -35,8 +35,8 @@
/datum/bioware/muscled_veins/on_gain()
..()
ADD_TRAIT(owner, TRAIT_STABLEHEART, "muscled_veins")
ADD_TRAIT(owner, TRAIT_STABLEHEART, EXPERIMENTAL_SURGERY_TRAIT)
/datum/bioware/muscled_veins/on_lose()
..()
REMOVE_TRAIT(owner, TRAIT_STABLEHEART, "muscled_veins")
REMOVE_TRAIT(owner, TRAIT_STABLEHEART, EXPERIMENTAL_SURGERY_TRAIT)
code/modules/surgery/advanced/bioware/nerve_grounding.dm
+2 -2
View File
@@ -35,8 +35,8 @@
/datum/bioware/grounded_nerves/on_gain()
..()
ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, "grounded_nerves")
ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, EXPERIMENTAL_SURGERY_TRAIT)
/datum/bioware/grounded_nerves/on_lose()
..()
REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, "grounded_nerves")
REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, EXPERIMENTAL_SURGERY_TRAIT)
code/modules/surgery/organs/augments_internal.dm
+2 -2
View File
@@ -61,7 +61,7 @@
else
for(var/obj/item/I in stored_items)
to_chat(owner, "<span class='notice'>Your [owner.get_held_index_name(owner.get_held_index_of_item(I))]'s grip tightens.</span>")
ADD_TRAIT(I, TRAIT_NODROP, ANTI_DROP_IMPLANT_TRAIT)
ADD_TRAIT(I, TRAIT_NODROP, IMPLANT_TRAIT)
else
release_items()
@@ -85,7 +85,7 @@
/obj/item/organ/cyberimp/brain/anti_drop/proc/release_items()
for(var/obj/item/I in stored_items)
REMOVE_TRAIT(I, TRAIT_NODROP, ANTI_DROP_IMPLANT_TRAIT)
REMOVE_TRAIT(I, TRAIT_NODROP, IMPLANT_TRAIT)
stored_items = list()
code/modules/surgery/organs/tongue.dm
+3 -3
View File
@@ -444,8 +444,8 @@
M.verb_whisper = "subtly signs"
M.verb_sing = "rythmically signs"
M.verb_yell = "emphatically signs"
ADD_TRAIT(M, TRAIT_SIGN_LANG, "tongue")
REMOVE_TRAIT(M, TRAIT_MUTE, "tongue")
ADD_TRAIT(M, TRAIT_SIGN_LANG, ORGAN_TRAIT)
REMOVE_TRAIT(M, TRAIT_MUTE, ORGAN_TRAIT)
/obj/item/organ/tongue/tied/Remove(mob/living/carbon/M, special = 0)
..()
@@ -454,7 +454,7 @@
M.verb_whisper = initial(verb_whisper)
M.verb_sing = initial(verb_sing)
M.verb_yell = initial(verb_yell)
REMOVE_TRAIT(M, TRAIT_SIGN_LANG, "tongue") //People who are Ahealed get "cured" of their sign language-having ways. If I knew how to make the tied tongue persist through aheals, I'd do that.
REMOVE_TRAIT(M, TRAIT_SIGN_LANG, ORGAN_TRAIT) //People who are Ahealed get "cured" of their sign language-having ways. If I knew how to make the tied tongue persist through aheals, I'd do that.
//Thank you Jwapplephobia for helping me with the literal hellcode below