Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Anomaly Core Edits #3786

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+47 −9
Open

Anomaly Core Edits #3786

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
48f5e34
anomaly edits
Erikafox Nov 16, 2024
0c02622
yeah im learning python shut up
Erikafox Nov 16, 2024
261f76b
Update anomalies.dm
Erikafox Nov 16, 2024
f9f16dc
ww
Erikafox Nov 16, 2024
0abecd5
Update anomalies.dm
Erikafox Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/game/objects/effects/anomalies/anomalies_plasmasoul.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
harm_surrounding_mobs()

/obj/effect/anomaly/plasmasoul/Bumped(atom/movable/AM)
if(!COOLDOWN_FINISHED(src, pulse_cooldown))
return

COOLDOWN_START(src, pulse_cooldown, pulse_delay)
var/turf/open/spot = locate(rand(src.x-effectrange, src.x+effectrange), rand(src.y-effectrange, src.y+effectrange), src.z)
harm_surrounding_mobs()
if(istype(spot))
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/effects/anomalies/anomalies_veins.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/effect/anomaly/veins
name = "veins"
name = "fountain"
icon_state = "veins"
desc = "Throbbing purple veins, an exposed artery of the world. It thirsts."
desc = "Throbbing purple veins, an exposed artery of the world. It leaks into the world beyond it."
density = TRUE
core = /obj/item/assembly/signaler/anomaly/veins
effectrange = 3
Expand Down
48 changes: 41 additions & 7 deletions code/modules/assembly/anomalies.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
name = "\improper bluespace anomaly core"
desc = "The stabilized core of a bluespace anomaly. It keeps phasing in and out of view."
icon_state = "anomaly core"
grind_results = list(/datum/reagent/bluespace = 25)

/obj/item/assembly/signaler/anomaly/bluespace/anomaly_core_detonation()
//just teleports people
Expand All @@ -62,18 +63,20 @@
name = "\improper flux anomaly core"
desc = "The stabilized core of a flux anomaly. Touching it makes your skin tingle."
icon_state = "flux core"
grind_results = list(/datum/reagent/teslium = 15)

/obj/item/assembly/signaler/anomaly/flux/anomaly_core_detonation()
//zap
visible_message(span_warning("Electrical arcs flash off of [src] as it fizzles out!"))
tesla_zap(src, 3, 1000, ZAP_FUSION_FLAGS)
tesla_zap(src, 5, 7000, ZAP_FUSION_FLAGS)
..()

///Gravity Anomaly
/obj/item/assembly/signaler/anomaly/grav
name = "\improper gravitational anomaly core"
desc = "The stabilized core of a gravitational anomaly. It feels much heavier than it looks."
icon_state = "grav core"
grind_results = list(/datum/reagent/gravitum = 20, /datum/reagent/liquid_dark_matter = 10)

/obj/item/assembly/signaler/anomaly/grav/anomaly_core_detonation()
//throngles u cutely
Expand All @@ -90,15 +93,17 @@
name = "\improper hallucination anomaly core"
desc = "The stabilized core of a hallucination anomaly. It's never entirely there."
icon_state = "hallucination_core"
grind_results = list(/datum/reagent/drug/space_drugs = 20) //i cannot figure out what to do with this for the life of me

///Heartbeat Anomaly
/obj/item/assembly/signaler/anomaly/heartbeat
name = "\improper heartbeat anomaly core"
desc = "The stabilized core of a heartbeat anomaly. Pulses of heat run across its shell."
grind_results = list(/datum/reagent/uranium/radium = 30, /datum/reagent/uranium = 20)

/obj/item/assembly/signaler/anomaly/heartbeat/anomaly_core_detonation()
visible_message(span_warning("[src] expands and throbs, before shattering into dozens of fragments!"))
radiation_pulse(src, 500, 2)
radiation_pulse(src, 1000, 3)
new /obj/effect/decal/cleanable/glass/strange(src)
..()

Expand All @@ -107,6 +112,7 @@
name = "\improper melter anomaly core"
desc = "The stabilized core of a melter anomaly. It sizzles and crackles."
icon_state = "pyro core"
grind_results = list(/datum/reagent/toxin/acid/nitracid = 10, /datum/reagent/toxin/acid/fluacid = 10, /datum/reagent/toxin/acid = 10) //soup

/obj/item/assembly/signaler/anomaly/melter/anomaly_core_detonation()
visible_message(span_warning("[src] melts into a glowing residue!"))
Expand All @@ -117,25 +123,42 @@
/obj/item/assembly/signaler/anomaly/phantom
name = "\improper phantom anomaly core"
desc = "The stabilized core of a phantom anomaly. It quietly screams."
grind_results = list(/datum/reagent/blood = 20)

/obj/item/assembly/signaler/anomaly/phantom/anomaly_core_detonation()
playsound(src,'sound/hallucinations/far_noise.ogg', 100, 0, 50, TRUE, TRUE)
visible_message(span_warning("[src] screams as it disappates!"))
visible_message(span_warning("[src] screams as it fades, trying to lash out!"))
for(var/mob/living/carbon/handsy in range(5, src))
if(handsy.stat != DEAD)
var/grab_dir = turn(handsy.dir, pick(-90, 90, 180, 180))
var/turf/spawn_turf = get_ranged_target_turf(handsy, grab_dir, 8)
if(!spawn_turf)
return
new /obj/effect/temp_visual/dir_setting/curse/grasp_portal(spawn_turf, handsy.dir)
playsound(spawn_turf, 'sound/effects/curse2.ogg', 80, TRUE, -1)
var/obj/projectile/curse_hand/phantom/hand = new (spawn_turf)
hand.preparePixelProjectile(handsy, spawn_turf)
if(QDELETED(hand))
return
hand.fire()
..()

///Plasmasoul Anomaly
/obj/item/assembly/signaler/anomaly/plasmasoul
name = "\improper plasmasoul anomaly core"
desc = "The stabilized core of a plasmasoul anomaly. The air around it hisses."
grind_results = list(/datum/reagent/toxin/plasma = 50)

/obj/item/assembly/signaler/anomaly/plasmasoul/anomaly_core_detonation()
visible_message(span_warning("[src] rapidly delaminates, leaving behind trace vapors!"))
visible_message(span_warning("[src] rapidly delaminates into plasma!"))
atmos_spawn_air("plasma=500;TEMP=[T20C]")
..()

///Pulsar Anomaly
/obj/item/assembly/signaler/anomaly/pulsar
name = "\improper pulsar anomaly core"
desc = "The stabilized core of a pulsar anomaly. Electromagnetic crackles come off it."
grind_results = (/datum/reagent/iron = 25, /datum/reagent/uranium = 25) //lewl

Check failure on line 161 in code/modules/assembly/anomalies.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD0001: Expected ')'

Check failure on line 161 in code/modules/assembly/anomalies.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD0001: Expected end of object statement

Check failure on line 161 in code/modules/assembly/anomalies.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD0001: Expected dedent

Check failure on line 161 in code/modules/assembly/anomalies.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD0001: Expected end of object statement

Check warning on line 161 in code/modules/assembly/anomalies.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD0000: Error recovery had to skip to code/modules/assembly/anomalies.dm:163:6

Check failure on line 161 in code/modules/assembly/anomalies.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD0501: Cannot write to const var

Check failure on line 161 in code/modules/assembly/anomalies.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD0011: Invalid initial value for "grind_results"

Check failure on line 161 in code/modules/assembly/anomalies.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

got ',', expected one of: operator, field access, ')'

/obj/item/assembly/signaler/anomaly/pulsar/anomaly_core_detonation()
visible_message(span_warning("[src] gives off one last pulse as it melts!"))
Expand All @@ -144,9 +167,10 @@

///Pyroclastic Anomaly
/obj/item/assembly/signaler/anomaly/pyro
name = "\improper pyroclastic anomaly core"
desc = "The stabilized core of a pyroclastic anomaly. It almost burns to touch."
name = "\improper plasmaball anomaly core"
desc = "The stabilized core of a plasmaball anomaly. It almost burns to touch."
icon_state = "pyro core"
grind_results = list(/datum/reagent/clf3 = 25, /datum/reagent/toxin/plasma = 15)

//glorified molotov
/obj/item/assembly/signaler/anomaly/pyro/anomaly_core_detonation()
Expand All @@ -163,6 +187,7 @@
/obj/item/assembly/signaler/anomaly/sparkler
name = "\improper sparkler anomaly core"
desc = "The stabilized core of a sparkler anomaly. Tiny electrical sparks arc off it."
grind_results = list(/datum/reagent/teslium = 10)

/obj/item/assembly/signaler/anomaly/sparkler/anomaly_core_detonation()
visible_message(span_warning("[src] shoots out one last assortment of sparks!"))
Expand All @@ -173,6 +198,7 @@
/obj/item/assembly/signaler/anomaly/tvstatic
name = "\improper static anomaly core"
desc = "The stabilized core of a static anomaly. Your head hurts just staring at it"
grind_results = list(/datum/reagent/three_eye = 5)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

erika what the fuck. thats Three Eye.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah i thought it'd be cool for the anomaly that gives you brain damage.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its funny but i dont think you should use the Admin Meme Chemical That Unavoidably Kills You And Makes You See Green. idk im not a maintainer.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It literally is permanent and cannot be undone, even by aheals. Not a good idea

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a: who the fuck ported this
b: who the fuck let this stay in here this long

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah okay so i went and read the code and it only does that if you overdose. which is stupid. but something to address in another pr. you'd need to find 5 static anomalies to get enough to overdose yourself like this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also the code is broken its not supposed to turn you into the lime man forever.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay so - i tested it and it did clear itself. idk what about overdose makes you turn into a citrus fruit, but unless a maintainer says nuh uh I think this is okay.
It's a rarer anomaly and a small amount of what is ostensibly a drug


/obj/item/assembly/signaler/anomaly/tvstatic/anomaly_core_detonation()
visible_message(span_warning("[src] withdraws into itself, one last message escaping it!"))
Expand All @@ -188,6 +214,7 @@
name = "\improper transfusion anomaly core"
desc = "The stabilized core of a tranfusion anomaly. Crimson slowly seeps out of the containment unit."
icon_state = "pyro core"
grind_results = list(/datum/reagent/toxin/heparin = 15, /datum/reagent/blood = 35)
var/blood_stored
var/blood_max

Expand Down Expand Up @@ -222,6 +249,11 @@
/obj/item/assembly/signaler/anomaly/veins
name = "\improper fountain anomaly core"
desc = "The stabilized core of a fountain anomaly. It's slippery, like an intestine."
grind_results = list(/datum/reagent/medicine/strange_reagent = 1)

/obj/item/assembly/signaler/anomaly/veins/Initialize()
. = ..()
grind_results = list(/datum/reagent/medicine/strange_reagent = rand(10,20))

/obj/item/assembly/signaler/anomaly/veins/anomaly_core_detonation()
//goreshit
Expand All @@ -231,14 +263,16 @@
/obj/effect/gibspawner/generic/animal
))
visible_message(span_warning("[src] erupts into a fountain of gore and viserca!"))
new mess(src.loc)
for(var/i in range(0,4))
new mess(src.loc)
..()

///Vortex Anomaly
/obj/item/assembly/signaler/anomaly/vortex
name = "\improper vortex anomaly core"
desc = "The stabilized core of a vortex anomaly. It won't sit still, as if some invisible force is acting on it."
icon_state = "vortex core"
grind_results = list(/datum/reagent/liquid_dark_matter = 30)

/obj/item/assembly/signaler/anomaly/vortex/anomaly_core_detonation()
//disappears bigly
Expand Down
Loading