mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-31 00:59:16 +01:00
Merge pull request #8531 from Spookerton/spkrtn/sys/global-agenda
updates all bare globals to use /global/ semantics, and all shared members to /static/
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
var/datum/controller/subsystem/air/air_master
|
||||
var/global/datum/controller/subsystem/air/air_master
|
||||
|
||||
var/tick_multiplier = 2
|
||||
var/global/tick_multiplier = 2
|
||||
|
||||
/*
|
||||
|
||||
|
||||
+8
-8
@@ -1,11 +1,11 @@
|
||||
var/image/assigned = image('icons/Testing/Zone.dmi', icon_state = "assigned")
|
||||
var/image/created = image('icons/Testing/Zone.dmi', icon_state = "created")
|
||||
var/image/merged = image('icons/Testing/Zone.dmi', icon_state = "merged")
|
||||
var/image/invalid_zone = image('icons/Testing/Zone.dmi', icon_state = "invalid")
|
||||
var/image/air_blocked = image('icons/Testing/Zone.dmi', icon_state = "block")
|
||||
var/image/zone_blocked = image('icons/Testing/Zone.dmi', icon_state = "zoneblock")
|
||||
var/image/blocked = image('icons/Testing/Zone.dmi', icon_state = "fullblock")
|
||||
var/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark")
|
||||
var/global/image/assigned = image('icons/Testing/Zone.dmi', icon_state = "assigned")
|
||||
var/global/image/created = image('icons/Testing/Zone.dmi', icon_state = "created")
|
||||
var/global/image/merged = image('icons/Testing/Zone.dmi', icon_state = "merged")
|
||||
var/global/image/invalid_zone = image('icons/Testing/Zone.dmi', icon_state = "invalid")
|
||||
var/global/image/air_blocked = image('icons/Testing/Zone.dmi', icon_state = "block")
|
||||
var/global/image/zone_blocked = image('icons/Testing/Zone.dmi', icon_state = "zoneblock")
|
||||
var/global/image/blocked = image('icons/Testing/Zone.dmi', icon_state = "fullblock")
|
||||
var/global/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark")
|
||||
|
||||
/connection_edge/var/dbg_out = 0
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
var/image/contamination_overlay = image('icons/effects/contamination.dmi')
|
||||
var/global/image/contamination_overlay = image('icons/effects/contamination.dmi')
|
||||
|
||||
/pl_control
|
||||
var/PHORON_DMG = 3
|
||||
|
||||
Reference in New Issue
Block a user