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

Changes person cap on pod from hardcoded to var #4130

Merged
merged 11 commits into from
Aug 8, 2023
Merged

Changes person cap on pod from hardcoded to var #4130

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c4caddf
Automatic changelog for PR #3470 [ci skip]
BeagleGaming1 Jun 20, 2023
19060a1
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 Jun 20, 2023
8d5e539
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 Jun 29, 2023
2f04a5f
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 8, 2023
16fd442
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 21, 2023
c438267
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 23, 2023
6818bf0
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 24, 2023
7d6ec07
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 27, 2023
4ec92b2
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Aug 3, 2023
68d49d6
Merge branch 'cmss13-devs:master' into master
BeagleGaming1 Aug 5, 2023
e12cb3c
uncapped
BeagleGaming1 Aug 7, 2023
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
7 changes: 5 additions & 2 deletions code/modules/shuttle/shuttles/escape_shuttle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@
rechargeTime = SHUTTLE_RECHARGE
ignitionTime = 8 SECONDS
ignition_sound = 'sound/effects/escape_pod_warmup.ogg'
/// The % chance of the escape pod crashing into the groundmap
/// The % chance of the escape pod crashing into the groundmap before lifeboats leaving
var/early_crash_land_chance = 75
/// The % chance of the escape pod crashing into the groundmap
var/crash_land_chance = 25
/// How many people can be in the escape pod before it crashes
var/max_capacity = 3

var/datum/door_controller/single/door_handler = new()
var/launched = FALSE
Expand Down Expand Up @@ -71,7 +74,7 @@
occupant_count++
for(var/obj/structure/machinery/cryopod/evacuation/cryotube in interior_area)
cryos += list(cryotube)
if (occupant_count > 3)
if (occupant_count > max_capacity)
playsound(src,'sound/effects/escape_pod_warmup.ogg', 50, 1)
sleep(31)
var/turf/sploded = return_center_turf()
Expand Down
Loading