forked from Bubberstation/Bubberstation
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Bubberstation:master' into master
- Loading branch information
Showing
11 changed files
with
439 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| author: "LT3" | ||
| delete-after: True | ||
| changes: | ||
| - rscadd: "Halloween candy meteors" | ||
| - bugfix: "Halloween, Easter, and Valentines Day events correctly trigger at roundstart" | ||
| - image: "More Halloween holiday tile patterns" | ||
| - sound: "Reduced length of meteor alert warning sound" | ||
| - balance: "Adjusted warning time for meteor waves depending on intensity" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,298 @@ | ||
| GLOBAL_LIST_INIT(meteors_candy_halloween, list( | ||
| /obj/effect/meteor/candy/party_popper = 6, | ||
| /obj/effect/meteor/candy/pumpkin = 16, | ||
| /obj/effect/meteor/candy/pumpking = 6, | ||
| /obj/effect/meteor/candy/corgi = 6, | ||
| /obj/effect/meteor/candy/syndie = 1, | ||
| /obj/effect/meteor/candy/bluespace = 2, | ||
| /obj/effect/meteor/candy/banana = 2, | ||
| )) | ||
|
|
||
| /datum/round_event/meteor_wave | ||
| /// Time we give before the wave for cargo to order / engineering to set up meteor shields | ||
| var/warning_time = 30 EVENT_SECONDS | ||
| /// Number of SSevent ticks for the wave to last (TG original: 60) | ||
| var/wave_duration = 45 | ||
| /// Prefix for the announcement | ||
| var/announce_prefix = "Meteor Alert" | ||
| /// Description for the announcement | ||
| var/announce_desc = "Meteors" | ||
| /// Added to the announcement giving a preview of the wave intensity | ||
| var/announce_fluff = "Crew are advised to take shelter within the central areas of the station." | ||
|
|
||
| /datum/round_event/meteor_wave/threatening | ||
| warning_time = 420 EVENT_SECONDS // smoke a joint and start your mindless repairs | ||
| announce_fluff = "Portable shield generators may be procured by the cargo department. Ensure all sensitive areas and equipment are shielded." | ||
|
|
||
| /datum/round_event/meteor_wave/catastrophic | ||
| warning_time = 420 EVENT_SECONDS | ||
| announce_fluff = "Portable shield generators may be procured by the cargo department. Ensure all sensitive areas and equipment are shielded." | ||
|
|
||
| /datum/round_event/meteor_wave/dust_storm | ||
| warning_time = 6 EVENT_SECONDS | ||
|
|
||
| /datum/round_event/meteor_wave/meaty | ||
| announce_prefix = "Oh crap, get the mop." | ||
| announce_desc = "Meaty ores" | ||
| announce_fluff = "Please refrain from eating the space meat. We know it's tempting, but this is not the time to test your culinary curiosity." | ||
|
|
||
| /datum/round_event/meteor_wave/candy | ||
| wave_name = "candy" | ||
| announce_prefix = "2SPOOKY DELIVERY INCOMING" | ||
| announce_desc = "Spooky packages" | ||
| announce_fluff = "We're not responsible for what happens if you try to stick fragments in your mouth. Why do we even have to tell you that?" | ||
|
|
||
| /datum/round_event/meteor_wave/New() | ||
| . = ..() | ||
| start_when = rand(warning_time, warning_time * 1.5) | ||
| end_when = start_when + rand(wave_duration, wave_duration * 1.5) | ||
|
|
||
| /datum/round_event/meteor_wave/determine_wave_type() | ||
| if(!wave_name) | ||
| wave_name = pick_weight(list( | ||
| "normal" = 50, | ||
| "threatening" = 40, | ||
| "catastrophic" = 10)) | ||
|
|
||
| if(check_holidays(HALLOWEEN)) | ||
| if(prob(50)) | ||
| wave_name = "candy" | ||
| wave_type = GLOB.meteors_candy_halloween | ||
| warning_time = /datum/round_event/meteor_wave/candy::warning_time | ||
| announce_prefix = /datum/round_event/meteor_wave/candy::announce_prefix | ||
| announce_desc = /datum/round_event/meteor_wave/candy::announce_desc | ||
| announce_fluff = /datum/round_event/meteor_wave/candy::announce_fluff | ||
| return | ||
|
|
||
| switch(wave_name) | ||
| if("normal") | ||
| wave_type = GLOB.meteors_normal | ||
| if("threatening") | ||
| wave_type = GLOB.meteors_threatening | ||
| if("catastrophic") | ||
| if(check_holidays(HALLOWEEN)) | ||
| wave_type = GLOB.meteorsSPOOKY | ||
| else | ||
| wave_type = GLOB.meteors_catastrophic | ||
| if("meaty") | ||
| wave_type = GLOB.meateors | ||
| if("space dust") | ||
| wave_type = GLOB.meteors_dust | ||
| if("halloween") | ||
| wave_type = GLOB.meteorsSPOOKY | ||
| if("candy") | ||
| wave_type = GLOB.meteors_candy_halloween | ||
| else | ||
| stack_trace("Wave name of [wave_name] not recognised.") | ||
| kill() | ||
|
|
||
| /datum/round_event/meteor_wave/announce(fake) | ||
| priority_announce( | ||
| text = "[announce_desc] have been detected on collision course with the station. The energy field generator is disabled or missing. First collision in approximately [DisplayTimeText(start_when * 20, 10)]. [announce_fluff]", | ||
| title = announce_prefix, | ||
| sound = ANNOUNCER_METEORWARNING, | ||
| ) | ||
|
|
||
| if(fake) | ||
| return | ||
|
|
||
| if(warning_time > 180 EVENT_SECONDS) | ||
| addtimer(CALLBACK(src, PROC_REF(meteor_reminder)), ((start_when * 20) - 15 SECONDS)) | ||
|
|
||
| /datum/round_event/meteor_wave/proc/meteor_reminder() | ||
| event_minimum_security_level(min_level = SEC_LEVEL_ORANGE, eng_access = TRUE, maint_access = FALSE) | ||
| priority_announce( | ||
| text = "[announce_desc] approaching, brace for impact. Long range scanners indicate a high density of meteors incoming, the kind of impact that makes you rethink your life choices. So, hold on tight and try not to fly into anything too important.", | ||
| title = announce_prefix, | ||
| sound = 'sound/items/radio/radio_important.ogg', // basically silent, since the securitylevel proc will make a sound | ||
| sender_override = "[command_name()] Engineering Division", | ||
| color_override = "orange", | ||
| ) | ||
|
|
||
| /datum/round_event_control/meteor_wave/candy | ||
| name = "Meteor Wave: Candy" | ||
| typepath = /datum/round_event/meteor_wave/candy | ||
| weight = 0 | ||
| description = "A meteor wave for the holidays, filled with candy." | ||
|
|
||
| /obj/effect/meteor | ||
| lifetime = 45 SECONDS | ||
|
|
||
| /obj/effect/meteor/candy | ||
| name = "debug candy meteor" | ||
| desc = "if you see this, shove a twink bar into your nearest coder" | ||
| dropamt = 8 | ||
| meteordrop = list( | ||
| /obj/item/food/candy/hundred_credit_bar, | ||
| /obj/item/food/candy/coconut_joy, | ||
| /obj/item/food/candy/hurr_bar, | ||
| /obj/item/food/candy/laughter_bar, | ||
| /obj/item/food/candy/kit_catgirl_metaclique_bar, | ||
| /obj/item/food/candy/twink_bar, | ||
| /obj/item/food/candy/malf_way, | ||
| /obj/item/food/candy/triggerfinger, | ||
| /obj/item/food/sosjerky, | ||
| /obj/item/food/syndicake, | ||
| /obj/item/food/energybar, | ||
| /obj/item/food/cnds/random, | ||
| /obj/item/food/cornchips, | ||
| /obj/item/food/shok_roks/random, | ||
| /obj/item/food/cookie/sugar/spookyskull, | ||
| /obj/item/food/cookie/sugar/spookycoffin, | ||
| /obj/item/food/candy_corn, | ||
| ) | ||
|
|
||
| /obj/effect/meteor/candy/get_hit() | ||
| hits-- | ||
| if(hits <= 0) | ||
| meteor_effect() | ||
| candy_effect() | ||
| qdel(src) | ||
|
|
||
| /obj/effect/meteor/candy/proc/candy_effect() | ||
| var/list/scatter_locations = list() | ||
| var/turf/my_turf = get_turf(src) | ||
| for(var/turf/turf_in_view in view(2, my_turf)) | ||
| if(isclosedturf(turf_in_view)) | ||
| continue | ||
|
|
||
| scatter_locations += turf_in_view | ||
|
|
||
| for(var/throws = dropamt, throws > 0, throws--) | ||
| var/thing_to_spawn = pick(meteordrop) | ||
| var/turf/spawn_loc = pick(scatter_locations) | ||
| addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(make_fluff_debris), thing_to_spawn, spawn_loc), 1 SECONDS); | ||
|
|
||
| /proc/make_fluff_debris(type_to_make, location) | ||
| new type_to_make(location) | ||
| new /obj/effect/decal/cleanable/confetti(location) | ||
|
|
||
| /obj/effect/meteor/candy/ram_turf(turf/rammed_turf) | ||
| if(!isspaceturf(rammed_turf)) | ||
| new /obj/effect/decal/cleanable/confetti(rammed_turf) | ||
|
|
||
| /obj/effect/meteor/candy/pumpkin | ||
| name = "cat-o-lantern" | ||
| desc = "A pumpkin-shaped meteor filled with candy. It's a bit spooky." | ||
| icon_state = "spooky" | ||
| threat = 5 | ||
|
|
||
| /obj/effect/meteor/candy/pumpkin/meteor_effect() | ||
| ..() | ||
| explosion(src, heavy_impact_range = 1, light_impact_range = 2, flash_range = 3, adminlog = FALSE) | ||
|
|
||
| /obj/effect/meteor/candy/pumpking | ||
| name = "PUMPKING" | ||
| desc = "THE PUMPKING'S COMING!" | ||
| icon_state = "spooky" | ||
| hits = 6 | ||
| heavy = TRUE | ||
| dropamt = 9 | ||
| threat = 10 | ||
|
|
||
| /obj/effect/meteor/candy/pumpking/Initialize() | ||
| . = ..() | ||
| src.transform *= 2 | ||
| meteorsound = pick('sound/effects/hallucinations/im_here1.ogg', 'sound/effects/hallucinations/im_here2.ogg') | ||
|
|
||
| /obj/effect/meteor/candy/pumpking/meteor_effect() | ||
| ..() | ||
| explosion(src, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 3, flash_range = 4, adminlog = FALSE) | ||
|
|
||
| /obj/effect/meteor/candy/party_popper | ||
| name = "party popper" | ||
| desc = "A small device used for celebrations and annoying the janitor." | ||
| icon = 'icons/obj/toys/toy.dmi' | ||
| icon_state = "party_popper" | ||
| pass_flags = PASSTABLE | PASSGRILLE | ||
| hitpwr = EXPLODE_LIGHT | ||
| hits = 3 | ||
| threat = 4 | ||
| meteorsound = 'sound/effects/snap.ogg' | ||
|
|
||
| /obj/effect/meteor/candy/party_popper/meteor_effect() | ||
| ..() | ||
| new /obj/item/reagent_containers/spray/chemsprayer/party(get_turf(src)) | ||
|
|
||
| /obj/effect/meteor/candy/corgi | ||
| name = "corgi pinata" | ||
| desc = "Who thought beating candy out of dogs was a fun activity anyways?" | ||
| icon = 'icons/obj/toys/toy.dmi' | ||
| icon_state = "pinata" | ||
| threat = 5 | ||
|
|
||
| /obj/effect/meteor/candy/corgi/meteor_effect() | ||
| ..() | ||
| explosion(src, heavy_impact_range = 1, light_impact_range = 2, flash_range = 3, adminlog = FALSE) | ||
|
|
||
| /obj/effect/meteor/candy/syndie | ||
| name = "syndie pinata" | ||
| desc = "The red ones go faster... Now you know why." | ||
| icon = 'icons/obj/toys/toy.dmi' | ||
| icon_state = "pinata_syndie" | ||
| hits = 12 | ||
| heavy = TRUE | ||
| threat = 30 | ||
| meteordrop = list(/obj/item/reagent_containers/cocaine) | ||
| meteorsound = 'sound/effects/bamf.ogg' | ||
| var/package_count = 8 | ||
|
|
||
| /obj/effect/meteor/candy/syndie/meteor_effect() | ||
| ..() | ||
| var/start_turf = get_turf(src) | ||
|
|
||
| while(package_count > 0) | ||
| var/startSide = pick(GLOB.cardinals) | ||
| var/turf/destination = spaceDebrisStartLoc(startSide, z) | ||
| new /obj/effect/meteor/cluster_fragment(start_turf, destination) | ||
| package_count-- | ||
|
|
||
| explosion(src, heavy_impact_range = 2, light_impact_range = 3, flash_range = 4, adminlog = FALSE) | ||
|
|
||
| /obj/effect/meteor/cocaine_brick | ||
| name = "cocaine brick fragment" | ||
| desc = "A fast-moving fragment of exploded... white powder." | ||
| icon = 'modular_skyrat/modules/morenarcotics/icons/crack.dmi' | ||
| icon_state = "cocainebrick" | ||
| dropamt = 7 | ||
| meteordrop = list(/obj/item/reagent_containers/cocaine) | ||
| meteorsound = 'sound/effects/bamf.ogg' | ||
|
|
||
| /obj/effect/meteor/candy/bluespace | ||
| name = "bluespace chunk" | ||
| desc = "A large geode containing bluespace dust at its core, hurtling through space. That's the stuff the crew are here to research. How convenient for them." | ||
| icon_state = "bluespace" | ||
| dropamt = 9 | ||
| hits = 12 | ||
| threat = 12 | ||
| signature = "bluespace flux" | ||
|
|
||
| /obj/effect/meteor/candy/bluespace/Bump() | ||
| ..() | ||
| if(prob(35)) | ||
| do_teleport(src, get_turf(src), 6, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) | ||
|
|
||
| /obj/effect/meteor/candy/banana | ||
| name = "bananium chunk" | ||
| desc = "Maybe it's a chunk blasted off of the legendary Clown Planet... How annoying." | ||
| icon_state = "bananium" | ||
| dropamt = 9 | ||
| hits = 175 //Honks everything, including space tiles. Depending on the angle/how much stuff it hits, there's a fair chance that it will spare the station from the actual explosion | ||
| meteordrop = list(/obj/item/stack/ore/bananium) | ||
| meteorsound = 'sound/items/bikehorn.ogg' | ||
| threat = 15 | ||
| movement_type = PHASING | ||
| signature = "comedy" | ||
|
|
||
| /obj/effect/meteor/candy/banana/meteor_effect() | ||
| ..() | ||
| playsound(src, 'sound/items/airhorn/AirHorn.ogg', 100, TRUE, -1) | ||
| for(var/atom/movable/object in view(4, get_turf(src))) | ||
| var/turf/throwtarget = get_edge_target_turf(get_turf(src), get_dir(get_turf(src), get_step_away(object, get_turf(src)))) | ||
| object.safe_throw_at(throwtarget, 5, 1, force = MOVE_FORCE_STRONG) | ||
|
|
||
| /obj/effect/meteor/banana/ram_turf(turf/bumped) | ||
| for(var/mob/living/slipped in get_turf(bumped)) | ||
| slipped.slip(100, slipped.loc,- GALOSHES_DONT_HELP|SLIDE, 0, FALSE) | ||
| slipped.visible_message(span_warning("[src] honks [slipped] to the floor!"), span_userdanger("[src] harmlessly passes through you, knocking you over.")) | ||
| get_hit() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.