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

this has gone wildly out of scope, I'll finish it later. #322

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
+253 −410
Draft

this has gone wildly out of scope, I'll finish it later. #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1b97f79
smoke again, yippee
Ediblebomb Jun 22, 2024
e38bc78
Revert "smoke again, yippee"
Ediblebomb Jul 8, 2024
a39e5c0
works I think
Ediblebomb Jul 9, 2024
f8b5f55
CN20X is broken but I'll fix it later when I undraft it so who the fu…
Ediblebomb Jul 20, 2024
c862411
Summary (required)
Ediblebomb Jul 26, 2024
d7c809b
Update smoke.dm
Ediblebomb Aug 9, 2024
b0f3f62
is it done now? I think it's done now
Ediblebomb Aug 9, 2024
f97f992
remove bullshit
Ediblebomb Aug 9, 2024
c1abc9d
remove more bullshit
Ediblebomb Aug 9, 2024
65cfb23
Merge branch 'master' into the-only-reason-I-make-PRs-is-to-make-the-…
Ediblebomb Sep 13, 2024
f600a68
Revert "Merge branch 'master' into the-only-reason-I-make-PRs-is-to-m…
Ediblebomb Sep 13, 2024
3679a55
Reapply "Merge branch 'master' into the-only-reason-I-make-PRs-is-to-…
Ediblebomb Sep 13, 2024
3c48bc5
Update smoke.dm
Ediblebomb Sep 13, 2024
a34de1d
Update colonialmarines.dm
Ediblebomb Sep 14, 2024
f4594b4
Update smoke.dm
Ediblebomb Sep 14, 2024
019a10b
oops
Ediblebomb Sep 14, 2024
7a73797
Merge branch 'master' into the-only-reason-I-make-PRs-is-to-make-the-…
Ediblebomb Nov 1, 2024
0fc7c12
if this doesn't fix the checks I'm going to put this off for another…
Ediblebomb Nov 1, 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
1 change: 1 addition & 0 deletions code/__DEFINES/atmospherics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

/// Used in /obj/structure/pipes/vents/proc/create_gas
#define VENT_GAS_SMOKE "Smoke"
#define VENT_GAS_SLEEP "Sleep Gas"
#define VENT_GAS_CN20 "CN20 Nerve Gas"
#define VENT_GAS_CN20_XENO "CN20-X Nerve Gas"
#define VENT_GAS_LSD "ALD-91 LSD Gas"
25 changes: 0 additions & 25 deletions code/game/gamemodes/colonialmarines/colonialmarines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@

/datum/game_mode/colonialmarines/ds_first_landed(obj/docking_port/stationary/marine_dropship)
. = ..()
clear_lz_hazards() // This shouldn't normally do anything, but is here just in case

/*
// Assumption: Shuttle origin is its center
Expand Down Expand Up @@ -219,29 +218,6 @@
warhead.warhead_impact(target) // This is a blocking call
playsound(target, 'sound/effects/smoke.ogg', vol=50, vary=1, sound_range=75)

///Spawns miasma smoke in landing zones
/datum/game_mode/colonialmarines/proc/spawn_lz_hazards()
var/datum/cause_data/new_cause_data = create_cause_data("CN20-X miasma")
for(var/area/area in GLOB.all_areas)
if(!area.is_landing_zone)
continue
if(!is_ground_level(area.z))
continue
for(var/turf/turf in area)
if(turf.density)
if(!istype(turf, /turf/closed/wall))
continue
var/turf/closed/wall/wall = turf
if(wall.hull)
continue
lz_smoke += new /obj/effect/particle_effect/smoke/miasma(turf, null, new_cause_data)

///Clears miasma smoke in landing zones
/datum/game_mode/colonialmarines/proc/clear_lz_hazards()
for(var/obj/effect/particle_effect/smoke/miasma/smoke as anything in lz_smoke)
smoke.time_to_live = rand(1, 5)
lz_smoke.Cut()

#define MONKEYS_TO_TOTAL_RATIO 1/32

/datum/game_mode/colonialmarines/proc/spawn_smallhosts()
Expand Down Expand Up @@ -405,7 +381,6 @@
/datum/game_mode/colonialmarines/ds_first_drop(obj/docking_port/mobile/marine_dropship)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(show_blurb_uscm)), DROPSHIP_DROP_MSG_DELAY)
add_current_round_status_to_end_results("First Drop")
clear_lz_hazards()

///////////////////////////
//Checks to see who won///
Expand Down
Loading
Loading