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

Merge pull request #2096 from CHOMPStationBot/upstream-merge-10505

Browse Source 
[MIRROR] Some misc runtime fixes
This commit is contained in:
Nadyr
2021-05-31 03:17:57 -04:00
committed by GitHub
parent a5436ba0dd fc34bf3549
commit 2c15103f44
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/subsystems/mobs.dm
View File

@@ -25,13 +25,10 @@ SUBSYSTEM_DEF(mobs)
/datum/controller/subsystem/mobs/fire(resumed = 0) /datum/controller/subsystem/mobs/fire(resumed = 0)
if (!resumed) if (!resumed)
src.currentrun = mob_list.Copy() src.currentrun = mob_list.Copy()
process_z.Cut() process_z.len = GLOB.living_players_by_zlevel.len
slept_mobs = 0 slept_mobs = 0
var/level = 1 for(var/level in 1 to process_z.len)
while(process_z.len < GLOB.living_players_by_zlevel.len)
process_z.len++
process_z[level] = GLOB.living_players_by_zlevel[level].len process_z[level] = GLOB.living_players_by_zlevel[level].len
level++
//cache for sanic speed (lists are references anyways) //cache for sanic speed (lists are references anyways)
var/list/currentrun = src.currentrun var/list/currentrun = src.currentrun

2
code/datums/outfits/jobs/security.dm
View File

@@ -42,7 +42,7 @@
/decl/hierarchy/outfit/job/security/detective/forensic /decl/hierarchy/outfit/job/security/detective/forensic
name = OUTFIT_JOB_NAME("Forensic technician") name = OUTFIT_JOB_NAME("Forensic technician")
head = null head = null
suit = /datum/gear/uniform/detective_alt2 suit = /obj/item/clothing/suit/storage/det_trench/alt2
uniform = /obj/item/clothing/under/det uniform = /obj/item/clothing/under/det
//VOREStation Edit End //VOREStation Edit End

4
code/modules/mining/mine_turfs.dm
View File

@@ -249,8 +249,10 @@ turf/simulated/mineral/floor/light_corner
spawn(1) // Otherwise most of the ore is lost to the explosion, which makes this rather moot. spawn(1) // Otherwise most of the ore is lost to the explosion, which makes this rather moot.
for(var/ore in resources) for(var/ore in resources)
var/amount_to_give = rand(CEILING(resources[ore]/2, 1), resources[ore]) // Should result in at least one piece of ore. var/amount_to_give = rand(CEILING(resources[ore]/2, 1), resources[ore]) // Should result in at least one piece of ore.
var/oretype = ore_types[ore]
if(!oretype)
return // this turf can't give that type
for(var/i=1, i <= amount_to_give, i++) for(var/i=1, i <= amount_to_give, i++)
var/oretype = ore_types[ore]
new oretype(src) new oretype(src)
resources[ore] = 0 resources[ore] = 0

3
code/modules/mob/dead/observer/observer.dm
View File

@@ -481,6 +481,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/proc/update_following() /mob/proc/update_following()
. = get_turf(src) . = get_turf(src)
for(var/mob/observer/dead/M in following_mobs) for(var/mob/observer/dead/M in following_mobs)
if(!.)
M.stop_following()
if(M.following != src) if(M.following != src)
following_mobs -= M following_mobs -= M
else else

4
maps/tether/tether_turfs.dm
View File

@@ -70,7 +70,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
"platinum" = 10, "platinum" = 10,
"hematite" = 20, "hematite" = 20,
"copper" = 8, "copper" = 8,
"tin" = 4, // "tin" = 4,
"bauxite" = 4, "bauxite" = 4,
"rutile" = 4, "rutile" = 4,
"carbon" = 20, "carbon" = 20,
@@ -87,7 +87,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
"platinum" = 5, "platinum" = 5,
"hematite" = 35, "hematite" = 35,
"copper" = 15, "copper" = 15,
"tin" = 10, // "tin" = 10,
"bauxite" = 10, "bauxite" = 10,
"rutile" = 10, "rutile" = 10,
"carbon" = 35, "carbon" = 35,