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 #568 from cadyn/vspull

Browse Source 
Direct pull from virgo
This commit is contained in:
Razgriz
2020-10-06 20:52:54 -07:00
committed by GitHub
parent f932863bb2 99af5bc3da
commit 0a8521f900
811 changed files with 30150 additions and 16874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystems/persistence.dm
View File

@@ -31,7 +31,7 @@ SUBSYSTEM_DEF(persistence)
return
// if((!T.z in GLOB.using_map.station_levels) || !initialized)
if(!T.z in using_map.station_levels)
if(!(T.z in using_map.station_levels))
return
if(!tracking_values[track_type])

2
code/controllers/subsystems/supply.dm
View File

@@ -105,7 +105,7 @@ SUBSYSTEM_DEF(supply)
// Sell phoron and platinum
if(istype(A, /obj/item/stack))
var/obj/item/stack/P = A
var/material/mat = P.get_material()
var/datum/material/mat = P.get_material()
if(mat?.supply_conversion_value)
EC.contents[EC.contents.len]["value"] = P.get_amount() * mat.supply_conversion_value
EC.contents[EC.contents.len]["quantity"] = P.get_amount()

10
code/controllers/subsystems/ticker.dm
View File

@@ -32,12 +32,6 @@ SUBSYSTEM_DEF(ticker)
var/list/datum/mind/minds = list() // The people in the game. Used for objective tracking.
// TODO - I am sure there is a better place these can go.
var/Bible_icon_state // icon_state the chaplain has chosen for his bible
var/Bible_item_state // item_state the chaplain has chosen for his bible
var/Bible_name // name of the bible
var/Bible_deity_name
var/random_players = FALSE // If set to nonzero, ALL players who latejoin or declare-ready join will have random appearances/genders
// TODO - Should this go here or in the job subsystem?
@@ -567,8 +561,4 @@ var/global/datum/controller/subsystem/ticker/ticker
minds = SSticker.minds
Bible_icon_state = SSticker.Bible_icon_state
Bible_item_state = SSticker.Bible_item_state
Bible_name = SSticker.Bible_name
Bible_deity_name = SSticker.Bible_deity_name
random_players = SSticker.random_players