-
Notifications
You must be signed in to change notification settings - Fork 71
Szchlachta attack random event #1038
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
Open
chazzyjazzy
wants to merge
11
commits into
DarkPack13:master
Choose a base branch
from
chazzyjazzy:szchlachta-attack-event
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+106
−9
Open
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
a1b8a10
szlachta
chazzyjazzy d37d873
chill
chazzyjazzy d2d68b5
bleh
chazzyjazzy f08439f
endpost announce
chazzyjazzy 5dbb70f
Update szlachta.dm
chazzyjazzy dc489ba
taking the old mobs out of deprecated
chazzyjazzy 9ea5221
Update szlachta_attack_event.dm
chazzyjazzy e9dfc8b
Update modular_darkpack/modules/events/code/szlachta_attack_event.dm
chazzyjazzy 554ce71
fix type path
chazzyjazzy 77a8af2
Update modular_darkpack/modules/events/code/szlachta_attack_event.dm
chazzyjazzy c89c847
Update endpost_announce.dm
chazzyjazzy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
modular_darkpack/modules/events/code/landmarks/event_landmarks.dm
This file contains hidden or 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,5 @@ | ||
| /obj/effect/landmark/event_spawn/szlachta | ||
| name = "szlachta event spawn" | ||
| icon = 'modular_darkpack/modules/events/icons/event_landmarks.dmi' | ||
| icon_state = "szlachta" | ||
|
|
51 changes: 51 additions & 0 deletions
51
modular_darkpack/modules/events/code/szlachta_attack_event.dm
This file contains hidden or 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,51 @@ | ||
| /datum/round_event_control/darkpack/szlachta | ||
| name = "Szlachta Attack" | ||
| typepath = /datum/round_event/szlachta | ||
| weight = 3 | ||
| min_players = 10 | ||
| max_occurrences = 2 | ||
| earliest_start = 90 MINUTES | ||
| category = EVENT_CATEGORY_INVASION | ||
| description = "Roving, loose szlachta have found their way into the city." | ||
| darkpack_allowed = TRUE | ||
|
|
||
| /datum/round_event/szlachta | ||
| start_when = 1 | ||
| announce_when = 5 | ||
|
|
||
| /datum/round_event/szlachta/announce(fake) | ||
| var/endpost_szlachta_author = pick("thesupernaturalguy71", "mhaley71", "justplumbin92", "illuminati_truther777", "satanwatch_now") | ||
| var/endpost_szlachta_post = pick("saw something soooo weird... :) new video coming soon on my channel", "just had the most terrifying moment of my life. saw some kind of monster.", "Yeap, whatever I saw, I'm just goin' right the fuck home.", "(the post has an extremely blurry image attached of what looks to be some kind monster. is it photoshopped?)") | ||
| endpost_announce(endpost_szlachta_post, endpost_szlachta_author) | ||
|
|
||
| /datum/round_event/szlachta/start() | ||
| var/list/szlachta_spawns = list() | ||
| for(var/obj/effect/landmark/event_spawn/szlachta/landmark in GLOB.generic_event_spawns) | ||
| szlachta_spawns += landmark | ||
|
|
||
| if(!length(szlachta_spawns)) | ||
| return | ||
|
|
||
| for(var/obj/effect/landmark/event_spawn/szlachta/landmark in szlachta_spawns) | ||
|
chazzyjazzy marked this conversation as resolved.
Outdated
|
||
| if(!prob(20)) | ||
| continue | ||
| var/turf/spawn_turf = get_turf(landmark) | ||
| if(!spawn_turf) | ||
| continue | ||
|
|
||
| // dont spawn if a player is nearby we don't need them popping in unrealistically | ||
| var/player_nearby = FALSE | ||
| for(var/mob/living/nearby_mob in view(DEFAULT_SIGHT_DISTANCE, spawn_turf)) | ||
| if(nearby_mob.client) | ||
| player_nearby = TRUE | ||
| break | ||
| if(player_nearby) | ||
| continue | ||
|
|
||
| new /mob/living/basic/szlachta(spawn_turf) | ||
| new /mob/living/basic/szlachta/fister(spawn_turf) | ||
| if(prob(40)) | ||
| new /mob/living/basic/szlachta(spawn_turf) | ||
|
|
||
| var/vozhd_type = (rand(1, 100) <= 80) ? /mob/living/basic/szlachta/tanker : /mob/living/basic/szlachta/otherthing | ||
| new vozhd_type(spawn_turf) | ||
Binary file not shown.
This file contains hidden or 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
Binary file not shown.
This file contains hidden or 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,10 @@ | ||
| // useful proc to announce events as endposts | ||
| /proc/endpost_announce(body, author = "SF Chronicle Nightly") | ||
| UNTYPED_LIST_ADD(SSphones.endpost_posts, list( | ||
| "body" = body, | ||
| "date" = station_time_timestamp("Day, Month DD, ") + "[CURRENT_STATION_YEAR]", | ||
| "time" = station_time_timestamp("hh:mm"), | ||
| "author" = author, | ||
| //"thumbsup_voters" = list(), | ||
| //"thumbsdown_voters" = list(), | ||
| )) |
This file contains hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should use this to prevent the event from firing if there is no landmarks.