cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6951 from Novacat/nova-basicfixes

Browse Source 
Real Crash Fix
This commit is contained in:
Novacat
2020-03-22 09:32:41 -04:00
committed by GitHub
parent 6c52239b6c baa24b9838
commit afa6aa785e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/autotransfer.dm
View File

@@ -7,7 +7,7 @@ datum/controller/transfer_controller
var/shift_last_vote = 0 //VOREStation Edit var/shift_last_vote = 0 //VOREStation Edit
datum/controller/transfer_controller/New() datum/controller/transfer_controller/New()
timerbuffer = config.vote_autotransfer_initial timerbuffer = config.vote_autotransfer_initial
shift_hard_end = config.vote_autotransfer_initial + (config.vote_autotransfer_interval * 1) //VOREStation Edit //Change this "1" to how many extend votes you want there to be. shift_hard_end = config.vote_autotransfer_initial + (config.vote_autotransfer_interval * 0) //VOREStation Edit //Change this "1" to how many extend votes you want there to be.
shift_last_vote = shift_hard_end - config.vote_autotransfer_interval //VOREStation Edit shift_last_vote = shift_hard_end - config.vote_autotransfer_interval //VOREStation Edit
START_PROCESSING(SSobj, src) START_PROCESSING(SSobj, src)

4
code/modules/events/carp_migration.dm
View File

@@ -45,7 +45,7 @@
var/group_size = rand(group_size_min, group_size_max) var/group_size = rand(group_size_min, group_size_max)
for (var/j = 0, j < group_size, j++) for (var/j = 0, j < group_size, j++)
spawn_one_carp(spawn_locations[i]) spawn_one_carp(spawn_locations[i])
i++ i++
return return
// Okay we did *not* have any landmarks, so lets do our best! // Okay we did *not* have any landmarks, so lets do our best!
@@ -66,7 +66,7 @@
target = T target = T
if(target) if(target)
M.ai_holder?.give_destination(target) // Ask carp to swim towards the middle of the map M.ai_holder?.give_destination(target) // Ask carp to swim towards the middle of the map
i++ i++
// Spawn a single carp at given location. // Spawn a single carp at given location.
/datum/event/carp_migration/proc/spawn_one_carp(var/loc) /datum/event/carp_migration/proc/spawn_one_carp(var/loc)