mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
adds new acid spit genetics mutation obtainable through polysmorphs (#20474)
* Add files via upload * Update DNA.dm * Update polysmorphs.dm * Update dna_injector.dm * Update dna_injector.dm * Update fire_breath.dm * 18 seconds is fairer * Update neurotoxin.dm * Update fire_breath.dm * Update code/modules/projectiles/projectile/special/neurotoxin.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> * bad molti code fixed!!! * Update fire_breath.dm * Add files via upload * Update neurotoxin.dm * Update acid_spit.dm * Update yogstation.dme * Update acid_spit.dm * Update acid_spit.dm * will just not fire at all if your mouth is covered too complicated to set up specific scenarios on how a breath mask or hardsuit helmet or gas mask or whatever should react differently from being acided * isn't the end result the same? Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> * Update code/datums/mutations/acid_spit.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> * oopsies Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> --------- Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
This commit is contained in:
@@ -56,6 +56,7 @@
|
||||
#define EXTRASTUN /datum/mutation/human/extrastun
|
||||
#define GELADIKINESIS /datum/mutation/human/geladikinesis
|
||||
#define CRYOKINESIS /datum/mutation/human/cryokinesis
|
||||
#define ACIDSPIT /datum/mutation/human/acidspit
|
||||
#define CEREBRAL /datum/mutation/human/cerebral
|
||||
#define THICKSKIN /datum/mutation/human/thickskin
|
||||
#define DENSEBONES /datum/mutation/human/densebones
|
||||
|
||||
51
code/datums/mutations/acid_spit.dm
Normal file
51
code/datums/mutations/acid_spit.dm
Normal file
@@ -0,0 +1,51 @@
|
||||
/datum/mutation/human/acidspit // polysmorph inert mutation
|
||||
name = "Acid Spit"
|
||||
desc = "An ancient mutation from xenomorphs that changes the salivary glands to produce acid"
|
||||
instability = 50
|
||||
difficulty = 12
|
||||
locked = TRUE
|
||||
text_gain_indication = span_notice("Your saliva burns your mouth!")
|
||||
text_lose_indication = span_notice("Your saliva cools down.")
|
||||
power_path = /datum/action/cooldown/spell/pointed/projectile/acid_spit
|
||||
|
||||
/datum/action/cooldown/spell/pointed/projectile/acid_spit
|
||||
name = "Acid Spit"
|
||||
desc = "You focus your corrosive saliva to spit at your target"
|
||||
button_icon = 'icons/mob/actions/actions_xeno.dmi'
|
||||
button_icon_state = "alien_neurotoxin_0"
|
||||
active_icon_state = "alien_neurotoxin_1"
|
||||
base_icon_state = "alien_neurotoxin_0"
|
||||
active_overlay_icon_state = "bg_spell_border_active_red"
|
||||
cooldown_time = 18 SECONDS
|
||||
spell_requirements = NONE
|
||||
antimagic_flags = NONE
|
||||
school = SCHOOL_EVOCATION
|
||||
sound = 'sound/effects/alien_spitacid.ogg'
|
||||
|
||||
active_msg = "You focus your acid spit!"
|
||||
deactive_msg = "You relax."
|
||||
projectile_type = /obj/item/projectile/bullet/acid
|
||||
|
||||
/datum/action/cooldown/spell/pointed/projectile/acid_spit/can_cast_spell(feedback)
|
||||
. = ..()
|
||||
if(!get_location_accessible(owner, BODY_ZONE_PRECISE_MOUTH))
|
||||
to_chat(owner, span_notice("Something is covering your mouth!"))
|
||||
return FALSE
|
||||
|
||||
/obj/item/projectile/bullet/acid
|
||||
name = "acid spit"
|
||||
icon_state = "neurotoxin"
|
||||
damage = 2
|
||||
damage_type = BURN
|
||||
flag = BIO
|
||||
range = 7
|
||||
speed = 1.8 // spit is not very fast
|
||||
|
||||
obj/item/projectile/bullet/acid/on_hit(atom/target, blocked = FALSE)
|
||||
if(isalien(target)) // shouldn't work on xenos
|
||||
nodamage = TRUE
|
||||
else if(!isopenturf(target))
|
||||
target.acid_act(50, 15) // does good damage to objects and structures
|
||||
else if(iscarbon(target))
|
||||
target.acid_act(18, 15) // balanced
|
||||
return ..()
|
||||
@@ -105,6 +105,16 @@
|
||||
desc = "Restores the dragon ancestry."
|
||||
add_mutations = list(FIREBREATH)
|
||||
|
||||
/obj/item/dnainjector/acidspit
|
||||
name = "\improper DNA injector (Acid Spit)"
|
||||
desc = "Lets you spit acid."
|
||||
add_mutations = list(ACIDSPIT)
|
||||
|
||||
/obj/item/dnainjector/antispit
|
||||
name ="\improper DNA injector (Anti-Acid Spit)"
|
||||
desc = "Cures your corrosive saliva"
|
||||
remove_mutations = list(ACIDSPIT)
|
||||
|
||||
/obj/item/dnainjector/xraymut
|
||||
name = "\improper DNA injector (X-ray)"
|
||||
desc = "Finally you can see what the Captain does."
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
acidmod = 0.2 //Their blood is literally acid
|
||||
action_speed_coefficient = 1.1 //claws aren't dextrous like hands
|
||||
speedmod = -0.1 //apex predator humanoid hybrid
|
||||
inert_mutation = ACIDSPIT
|
||||
punchdamagehigh = 11 //slightly better high end of damage
|
||||
punchstunthreshold = 11 //technically slightly worse stunchance
|
||||
payday_modifier = 0.3 //Some are quite literally slaves + they HAVE to work for NT
|
||||
|
||||
BIN
sound/effects/alien_spitacid.ogg
Normal file
BIN
sound/effects/alien_spitacid.ogg
Normal file
Binary file not shown.
@@ -707,6 +707,7 @@
|
||||
#include "code\datums\mood_events\mood_event.dm"
|
||||
#include "code\datums\mood_events\needs_events.dm"
|
||||
#include "code\datums\mutations\_combined.dm"
|
||||
#include "code\datums\mutations\acid_spit.dm"
|
||||
#include "code\datums\mutations\antenna.dm"
|
||||
#include "code\datums\mutations\autotomy.dm"
|
||||
#include "code\datums\mutations\body.dm"
|
||||
|
||||
Reference in New Issue
Block a user