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

Update VOREStation specific code to use merged in features.

Browse Source 
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
This commit is contained in:
Leshana
2018-01-19 17:54:43 -05:00
parent 3c3dac7102
commit 436d48b337
5 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_onclick/hud/hud.dm
View File

@@ -14,7 +14,7 @@ var/list/global_huds = list(
global_hud.meson,
global_hud.science,
global_hud.material,
global_hud.holomap
global_hud.holomap // VOREStation Edit - Holomap
)
/datum/hud/var/obj/screen/grab_intent
@@ -33,7 +33,7 @@ var/list/global_huds = list(
var/obj/screen/meson
var/obj/screen/science
var/obj/screen/material
var/obj/screen/holomap
var/obj/screen/holomap // VOREStation Edit - Holomap
/datum/global_hud/proc/setup_overlay(var/icon_state)
var/obj/screen/screen = new /obj/screen()
@@ -72,6 +72,7 @@ var/list/global_huds = list(
science = setup_overlay("science_hud")
material = setup_overlay("material_hud")
// VOREStation Edit Begin - Holomap
// The holomap screen object is actually totally invisible.
// Station maps work by setting it as an images location before sending to client, not
// actually changing the icon or icon state of the screen object itself!
@@ -83,6 +84,7 @@ var/list/global_huds = list(
holomap.icon = null
holomap.screen_loc = ui_holomap
holomap.mouse_opacity = 0
// VOREStation Edit End
var/obj/screen/O
var/i