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

Contractors #594

Merged
merged 4 commits into from
Jan 10, 2024
Merged

Contractors #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bdb1ed
rain and galaxies fix
wraith-54321 Dec 25, 2023
0fa7fda
fix disease
wraith-54321 Dec 27, 2023
e2b436c
slight improvement
wraith-54321 Dec 28, 2023
472f935
Merge remote-tracking branch 'upstream/master' into gib-contractor-bo…
wraith-54321 Jan 10, 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
2 changes: 1 addition & 1 deletion code/modules/events/ghost_role/sentient_disease.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "Spawn Sentient Disease"
typepath = /datum/round_event/ghost_role/sentient_disease
weight = 7
max_occurrences = 1
max_occurrences = 0 //monkestation edit: from 1 to 0
min_players = 25
earliest_start = 60 MINUTES //monke edit: 25 to 60
category = EVENT_CATEGORY_HEALTH
Expand Down
4 changes: 1 addition & 3 deletions ...station/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

/datum/round_event/antagonist/solo/ghost/nuclear_operative
excute_round_end_reports = TRUE
end_when = 60000 /// we will end on our own when revs win
var/static/datum/team/nuclear/nuke_team
var/set_leader = FALSE
var/required_role = ROLE_NUCLEAR_OPERATIVE
Expand All @@ -64,9 +63,8 @@

if(!set_leader)
set_leader = TRUE
var/datum/antagonist/nukeop/leader/leader_antag_datum = new()
var/datum/antagonist/nukeop/leader/leader_antag_datum = most_experienced.add_antag_datum(/datum/antagonist/nukeop/leader)
nuke_team = leader_antag_datum.nuke_team
most_experienced.add_antag_datum(leader_antag_datum)

if(antag_mind == most_experienced)
return
Expand Down
4 changes: 1 addition & 3 deletions monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

/datum/round_event/antagonist/solo/nuclear_operative
excute_round_end_reports = TRUE
end_when = 60000 /// we will end on our own when revs win
var/static/datum/team/nuclear/nuke_team
var/set_leader = FALSE
var/required_role = ROLE_NUCLEAR_OPERATIVE
Expand All @@ -65,9 +64,8 @@

if(!set_leader)
set_leader = TRUE
var/datum/antagonist/nukeop/leader/leader_antag_datum = new()
var/datum/antagonist/nukeop/leader/leader_antag_datum = most_experienced.add_antag_datum(/datum/antagonist/nukeop/leader)
nuke_team = leader_antag_datum.nuke_team
most_experienced.add_antag_datum(leader_antag_datum)

if(antag_mind == most_experienced)
return
Expand Down
6 changes: 3 additions & 3 deletions monkestation/code/modules/trading/unusual_effects/animation_housing/galaxies.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/component/particle_spewer/movement/galaxies
/datum/component/particle_spewer/galaxies
unusual_description = "galactic"
duration = 5 SECONDS
spawn_interval = 0.5 SECONDS
Expand All @@ -8,11 +8,11 @@

/datum/component/particle_spewer/galaxies/animate_particle(obj/effect/abstract/particle/spawned)
var/can_be_shooting = TRUE
if(prob(10))
if(prob(5))
spawned.icon_state = "moon"
can_be_shooting = FALSE

if(prob(10) && can_be_shooting)
if(prob(5) && can_be_shooting)
spawned.icon_state = "ringed_planet"
can_be_shooting = FALSE

Expand Down
19 changes: 19 additions & 0 deletions monkestation/code/modules/trading/unusual_effects/animation_housing/rain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
/datum/component/particle_spewer/rain
unusual_description = "gloomy"
icon_file = 'monkestation/code/modules/outdoors/icons/effects/particles/particle.dmi'
particle_state = "drop"
duration = 0.9 SECONDS
spawn_interval = 0.1 SECONDS
burst_amount = 3

/datum/component/particle_spewer/rain/animate_particle(obj/effect/abstract/particle/spawned)
if(prob(45))
spawned.layer = ABOVE_MOB_LAYER
spawned.pixel_x += rand(-14, 14)
spawned.pixel_y += rand(19, 25)
spawned.alpha = 20
spawned.color = pick(list(COLOR_BLUE_GRAY, COLOR_BLUE_LIGHT, COLOR_CARP_BLUE))

animate(spawned, time = 0.5 SECONDS, alpha = 255)
animate(spawned, time = 0.8 SECONDS, pixel_y = rand(-20, -12), easing = LINEAR_EASING)

addtimer(CALLBACK(src, PROC_REF(delete_particle), spawned), duration)
Loading