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.

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

Anomalies and Waste from Monke1 #4393

Merged
merged 22 commits into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
waltuh
  • Loading branch information
ThePooba committed Nov 28, 2024
commit cbb1a2af484c8868d196c6dedbc1fdb46321367e
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
/// How many seconds between each gas release
var/releasedelay = 10

//todo: make a /turf/open/floor/iron/snow that works identically to /turf/open/floor/iron but is snowy and doesnt reveal pipes
/obj/effect/anomaly/frost/anomalyEffect(seconds_per_tick)
..()

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#define MONKEY_SOUNDS list('sound/creatures/monkey/monkey_screech_1.ogg', 'sound/creatures/monkey/monkey_screech_2.ogg', 'sound/creatures/monkey/monkey_screech_3.ogg','sound/creatures/monkey/monkey_screech_4.ogg','sound/creatures/monkey/monkey_screech_5.ogg','sound/creatures/monkey/monkey_screech_6.ogg','sound/creatures/monkey/monkey_screech_7.ogg')

/obj/effect/anomaly/monkey //Monkey Anomaly (Random Chimp Event)
name = "Screeching Anomaly"
desc = "An anomalous one-way gateway that leads straight to some sort of a ape dimension."
icon_state = "dimensional_overlay"
color = "#a76d17"
lifespan = 35 SECONDS
var/active = TRUE

/obj/effect/anomaly/petsplosion/anomalyEffect(seconds_per_tick)
..()

playsound(src, pick(MONKEY_SOUNDS), vol = 33, vary = 1, mixer_channel = CHANNEL_MOB_SOUNDS)

if(isspaceturf(src) || !isopenturf(get_turf(src)))
return

if(!active)
active = TRUE
return

if(prob(10))
new /mob/living/carbon/human/species/monkey/angry(src.loc)
else
new /mob/living/carbon/human/species/monkey(src.loc)
active = FALSE

/obj/effect/anomaly/monkey/detonate()
if(prob(25))
new /mob/living/simple_animal/hostile/gorilla(src.loc)

Check failure on line 31 in monkestation/code/game/objects/effects/anomalies/anomalies_monkey.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0404: Path /mob/living/simple_animal/hostile/gorilla does not exist

#undef MONKEY_SOUNDS
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#define MONKEY_SOUNDS list('sound/creatures/monkey/monkey_screech_1.ogg', 'sound/creatures/monkey/monkey_screech_2.ogg', 'sound/creatures/monkey/monkey_screech_3.ogg','sound/creatures/monkey/monkey_screech_4.ogg','sound/creatures/monkey/monkey_screech_5.ogg','sound/creatures/monkey/monkey_screech_6.ogg','sound/creatures/monkey/monkey_screech_7.ogg')

/obj/effect/anomaly/monkey //Monkey Anomaly (Random Chimp Event)
name = "Screeching Anomaly"
desc = "An anomalous one-way gateway that leads straight to some sort of a ape dimension."
icon_state = "dimensional_overlay"
lifespan = 35 SECONDS
var/active = TRUE

Check failure on line 8 in monkestation/code/game/objects/effects/anomalies/anomalies_walteverse.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0014: Duplicate definition of var "active"
var/static/list/walter_spawns = list(

Check failure on line 9 in monkestation/code/game/objects/effects/anomalies/anomalies_walteverse.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0001: Expected dedent

Check failure on line 9 in monkestation/code/game/objects/effects/anomalies/anomalies_walteverse.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0001: Expected end of object statement

Check warning on line 9 in monkestation/code/game/objects/effects/anomalies/anomalies_walteverse.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to monkestation/code/game/objects/effects/anomalies/anomalies_walteverse.dm:23:1
/mob/living/basic/pet/dog/bullterrier/walter/saulter = 5,
/mob/living/basic/pet/dog/bullterrier/walter/negative = 5,
/mob/living/basic/pet/dog/bullterrier/walter/syndicate = 5,
/mob/living/basic/pet/dog/bullterrier/walter/doom = 5,
/mob/living/basic/pet/dog/bullterrier/walter/space = 5,
/mob/living/basic/pet/dog/bullterrier/walter/clown = 5,
/mob/living/basic/pet/dog/bullterrier/walter/french = 5,
/mob/living/basic/pet/dog/bullterrier/walter/british = 5,
/mob/living/basic/pet/dog/bullterrier/walter/wizard = 5,
/mob/living/basic/pet/dog/bullterrier/walter/smallter = 5,
/mob/living/basic/pet/dog/bullterrier/walter/sus = 1, //:(
)

/obj/effect/anomaly/petsplosion/anomalyEffect(seconds_per_tick)
..()

playsound(src, pick(MONKEY_SOUNDS), vol = 33, vary = 1, mixer_channel = CHANNEL_MOB_SOUNDS)

if(isspaceturf(src) || !isopenturf(get_turf(src)))
return

if(!active)
active = TRUE
return

if(prob(10))
new /mob/living/carbon/human/species/monkey/angry(src.loc)
else
new /mob/living/carbon/human/species/monkey(src.loc)
active = FALSE

/obj/effect/anomaly/monkey/detonate()
if(prob(25))
new /mob/living/basic/hostile/gorilla(src.loc)

Check failure on line 43 in monkestation/code/game/objects/effects/anomalies/anomalies_walteverse.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0404: Path /mob/living/basic/hostile/gorilla does not exist

#undef MONKEY_SOUNDS
15 changes: 15 additions & 0 deletions monkestation/code/modules/events/anomaly/anomaly_monkey.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/datum/round_event_control/anomaly/anomaly_monkey
name = "Anomaly: Petsplosion"
description = "Meow"
typepath = /datum/round_event/anomaly/anomaly_monkey

max_occurrences = 2
weight = 15
track = EVENT_TRACK_MUNDANE

/datum/round_event/anomaly/anomaly_monkey
start_when = 1
anomaly_path = /obj/effect/anomaly/monkey

/datum/round_event/anomaly/anomaly_monkey/announce(fake)
priority_announce("Lifebringer anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", SSstation.announcer.get_rand_alert_sound())
14 changes: 14 additions & 0 deletions monkestation/code/modules/events/anomaly/anomaly_walterverse.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/datum/round_event_control/anomaly/anomaly_walterverse
name = "Anomaly: Walterverse"
typepath = /datum/round_event/anomaly/anomaly_walterverse

max_occurrences = 1
weight = 5
track = EVENT_TRACK_MAJOR

/datum/round_event/anomaly/anomaly_walterverse
start_when = 1
anomaly_path = /obj/effect/anomaly/walterverse

Check failure on line 11 in monkestation/code/modules/events/anomaly/anomaly_walterverse.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0404: Path /obj/effect/anomaly/walterverse does not exist

/datum/round_event/anomaly/anomaly_walterverse/announce(fake)
priority_announce("The Walterverse has been opened. Expected location: [impact_area.name].", "Anomaly Alert", SSstation.announcer.get_rand_alert_sound())
135 changes: 135 additions & 0 deletions monkestation/code/modules/mob/living/basic/pets/walterverse.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
/mob/living/simple_animal/pet/dog/bullterrier/walter/saulter
name = "Saulter Goodman"
real_name = "Saulter Goodman"
desc = "Seccies and wardens are nothing compared to the might of this consititutional right loving lawyer."
icon = 'monkestation/icons/mob/walterverse.dmi'
icon_state = "saulter"
icon_living = "saulter"
icon_dead = "saulter_dead"
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
speak = list("barks!", "Hi, i'm Saul Goodman.", "Did you know you have rights?", "Based!")

/mob/living/simple_animal/pet/dog/bullterrier/walter/negative
name = "Negative Walter"
real_name = "Negative Walter"
desc = "Nar'sie and rat'var are a lot compared to the might of this skcurtretsnom despising god."
icon = 'monkestation/icons/mob/walterverse.dmi'
icon_state = "negative"
icon_living = "negative"
icon_dead = "negative_dead"
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
deathmessage = "starts moving"
speak = list("skrab!", "sfoow!", "retlaW", "skcurterif", "skcurtretsnom")

/mob/living/simple_animal/pet/dog/bullterrier/walter/syndicate
name = "Syndicate Walter"
real_name = "Syndicate Walter"
desc = "Nanotrasen and Centcom are nothing compared to the might of this nuke loving dog."
icon = 'monkestation/icons/mob/walterverse.dmi'
icon_state = "syndie"
icon_living = "syndie"
icon_dead = "syndie_dead"
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
speak = list("barks!", "woofs!", "Walter", "Down with Nanotrasen!", "For the Syndicate!")

/mob/living/simple_animal/pet/dog/bullterrier/walter/doom
name = "Doom Walter"
real_name = "Doom Walter"
desc = "Devils and Gods are nothing compared to the might of this gun loving soldier."
icon = 'monkestation/icons/mob/walterverse.dmi'
icon_state = "doom"
icon_living = "doom"
icon_dead = "doom_dead"
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
speak = list("...")

/mob/living/simple_animal/pet/dog/bullterrier/walter/space
name = "Space Walter"
real_name = "Space Walter"
desc = "Exploring the galaxies is nothing for this star loving dog."
icon = 'monkestation/icons/mob/walterverse.dmi'
icon_state = "space"
icon_living = "space"
icon_dead = "space_dead"
unsuitable_atmos_damage = 0
minbodytemp = TCMB
maxbodytemp = T0C + 40
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
speak = list("barks!", "woofs!", "spess!", "Walter", "firetrucks", "monstertrucks", "spaceships")

/mob/living/simple_animal/pet/dog/bullterrier/walter/sus
name = "Suspicious Walter"
real_name = "Suspicious Walter"
desc = "This vent loving dog is a little suspicious..."
icon = 'monkestation/icons/mob/walterverse.dmi'
icon_state = "sus"
icon_living = "sus"
icon_dead = "sus_dead"
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
ventcrawler = VENTCRAWLER_ALWAYS
deathmessage = "gets ejected"
speak = list("barks!", "woofs!", "sus!", "Walter", "firetrucks", "monstertrucks", "tasks")

/mob/living/simple_animal/pet/dog/bullterrier/walter/clown
name = "Clown Walter"
real_name = "Clown Walter"
desc = "Seccies and staff members are nothing compared to the might of this banana loving loving dog."
icon = 'monkestation/icons/mob/walterverse.dmi'
icon_state = "clown"
icon_living = "clown"
icon_dead = "clown_dead"
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
speak = list("barks!", "woofs!", "honks!", "Walter", "firetrucks", "monstertrucks")


/mob/living/simple_animal/pet/dog/bullterrier/walter/french
name = "French Walter"
real_name = "French Walter"
desc = "Nar'sie et rat'var ne sont rien comparés à la puissance de ce chien qui aime les monstertrucks."
icon = 'monkestation/icons/mob/walterverse.dmi'
icon_state = "french"
icon_living = "french"
icon_dead = "french_dead"
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
speak = list("aboiement!", "aboyer!", "Walter", "camions de pompiers", "camions monstres")

/mob/living/simple_animal/pet/dog/bullterrier/walter/british
name = "Bri'ish Wal'ah"
real_name = "Bri'ish Wal'ah"
desc = "Nar'sie and like ra''var are naw'hin' compared 'o 'he migh' of 'hiz mons'er'ruck lovin' dog."
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
speak = list("barks!", "woofs!", "Wal'ah", "fire'rucks", "mons'er'rucks")

/mob/living/simple_animal/pet/dog/bullterrier/walter/wizard
name = "Magic Walter"
real_name = "Magic Walter"
desc = "Assistants and secoffs are nothing compared to the might of this magic loving dog."
icon = 'monkestation/icons/mob/walterverse.dmi'
icon_state = "wizard"
icon_living = "wizard"
icon_dead = "wizard_dead"
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
speak = list("ONI SOMA", "CLANG!", "UN'LTD P'WAH", "AULIE OXIN FIERA", "GIN'YU`CAPAN")

/mob/living/simple_animal/pet/dog/bullterrier/walter/smallter
name = "Smallter"
real_name = "Smallter"
desc = "Nar'sie and rat'var are nothing compared to the might of this tiny dog."
gold_core_spawnable = FRIENDLY_SPAWN
unique_pet = TRUE
speak = list("barks", "woofs", "walter", "firetrucks", "monstertrucks")

/mob/living/simple_animal/pet/dog/bullterrier/walter/smallter/Initialize(mapload)
. = ..()
resize = 0.5

Check failure on line 134 in monkestation/code/modules/mob/living/basic/pets/walterverse.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0404: Unknown identifier "resize"
update_transform()
Binary file added monkestation/icons/mob/walterverse.dmi
Binary file not shown.
5 changes: 5 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6030,9 +6030,11 @@
#include "monkestation\code\game\objects\effects\anomalies\anomalies_dimensional_themes.dm"
#include "monkestation\code\game\objects\effects\anomalies\anomalies_fluid.dm"
#include "monkestation\code\game\objects\effects\anomalies\anomalies_frost.dm"
#include "monkestation\code\game\objects\effects\anomalies\anomalies_monkey.dm"
#include "monkestation\code\game\objects\effects\anomalies\anomalies_petsplosion.dm"
#include "monkestation\code\game\objects\effects\anomalies\anomalies_radiation.dm"
#include "monkestation\code\game\objects\effects\anomalies\anomalies_storm.dm"
#include "monkestation\code\game\objects\effects\anomalies\anomalies_walteverse.dm"
#include "monkestation\code\game\objects\effects\decal\nuclear_waste.dm"
#include "monkestation\code\game\objects\effects\effect_system\fluid_spread\effects_smoke.dm"
#include "monkestation\code\game\objects\effects\random\ai_module.dm"
Expand Down Expand Up @@ -7196,9 +7198,11 @@
#include "monkestation\code\modules\events\anomaly\anomaly_clown.dm"
#include "monkestation\code\modules\events\anomaly\anomaly_fluid.dm"
#include "monkestation\code\modules\events\anomaly\anomaly_frost.dm"
#include "monkestation\code\modules\events\anomaly\anomaly_monkey.dm"
#include "monkestation\code\modules\events\anomaly\anomaly_petsplosion.dm"
#include "monkestation\code\modules\events\anomaly\anomaly_radiation.dm"
#include "monkestation\code\modules\events\anomaly\anomaly_storm.dm"
#include "monkestation\code\modules\events\anomaly\anomaly_walterverse.dm"
#include "monkestation\code\modules\events\ghost_role\drifting_contractor.dm"
#include "monkestation\code\modules\events\wizard\summon_gifts.dm"
#include "monkestation\code\modules\factory_type_beat\boulder.dm"
Expand Down Expand Up @@ -7523,6 +7527,7 @@
#include "monkestation\code\modules\mob\living\basic\pets\lizard.dm"
#include "monkestation\code\modules\mob\living\basic\pets\mouse.dm"
#include "monkestation\code\modules\mob\living\basic\pets\snake.dm"
#include "monkestation\code\modules\mob\living\basic\pets\walterverse.dm"
#include "monkestation\code\modules\mob\living\basic\pets\parrot\_parrot.dm"
#include "monkestation\code\modules\mob\living\basic\pets\parrot\parrot_ai\parroting_action.dm"
#include "monkestation\code\modules\mob\living\basic\space_fauna\carp\carp.dm"
Expand Down
Loading