cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-27 22:16:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge polaris sync 01 17 2018

Browse Source 
Planes, layers, human/update_icon()
This commit is contained in:
Arokha Sieyes
2018-01-17 17:56:51 -05:00
committed by Leshana
parent f1e5343140 6fb1b66ced
commit ff228754b3
277 changed files with 20347 additions and 2214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration.dm
+4
View File
@@ -81,6 +81,7 @@ var/list/gamemode_cache = list()
var/cult_ghostwriter_req_cultists = 10 //...so long as this many cultists are active.
var/character_slots = 10 // The number of available character slots
var/loadout_slots = 3 // The number of loadout slots per character
var/max_maint_drones = 5 //This many drones can spawn,
var/allow_drone_spawn = 1 //assuming the admin allow them to.
@@ -653,6 +654,9 @@ var/list/gamemode_cache = list()
if("character_slots")
config.character_slots = text2num(value)
if("loadout_slots")
config.loadout_slots = text2num(value)
if("allow_drone_spawn")
config.allow_drone_spawn = text2num(value)
code/controllers/shuttle_controller.dm
+6 -2
View File
@@ -8,8 +8,12 @@ var/global/datum/shuttle_controller/shuttle_controller
/datum/shuttle_controller/proc/process()
//process ferry shuttles
for (var/datum/shuttle/ferry/shuttle in process_shuttles)
if (shuttle.process_state || shuttle.always_process)
for (var/datum/shuttle/shuttle in process_shuttles)
if(istype(shuttle, /datum/shuttle/ferry))
var/datum/shuttle/ferry/F = shuttle
if(F.process_state || F.always_process)
F.process()
else
shuttle.process()