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

POLARIS: Planes shenanigans. Begins 'plane' work.

Browse Source
This commit is contained in:
Arokha Sieyes
2018-01-13 23:24:48 -05:00
parent 05864e06ea
commit ad74dec1c0
52 changed files with 601 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/_onclick/hud/fullscreen.dm
View File

@@ -68,6 +68,7 @@
icon_state = "default"
screen_loc = "CENTER-7,CENTER-7"
layer = FULLSCREEN_LAYER
plane = PLANE_FULLSCREEN
mouse_opacity = 0
var/severity = 0

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

@@ -39,32 +39,30 @@ var/list/global_huds = list(
screen.icon = 'icons/obj/hud_full.dmi'
screen.icon_state = icon_state
screen.layer = SCREEN_LAYER
screen.plane = PLANE_FULLSCREEN
screen.mouse_opacity = 0
return screen
/obj/screen/global_screen
screen_loc = ui_entire_screen
layer = 17
plane = PLANE_FULLSCREEN
mouse_opacity = 0
/datum/global_hud/New()
//420erryday psychedellic colours screen overlay for when you are high
druggy = new /obj/screen()
druggy.screen_loc = ui_entire_screen
druggy = new /obj/screen/global_screen()
druggy.icon_state = "druggy"
druggy.layer = 17
druggy.mouse_opacity = 0
//that white blurry effect you get when you eyes are damaged
blurry = new /obj/screen()
blurry.screen_loc = ui_entire_screen
blurry = new /obj/screen/global_screen()
blurry.icon_state = "blurry"
blurry.layer = 17
blurry.mouse_opacity = 0
//static overlay effect for cameras and the like
whitense = new /obj/screen()
whitense.screen_loc = ui_entire_screen
whitense = new /obj/screen/global_screen()
whitense.icon = 'icons/effects/static.dmi'
whitense.icon_state = "1 light"
whitense.layer = 17
whitense.mouse_opacity = 0
nvg = setup_overlay("nvg_hud")
thermal = setup_overlay("thermal_hud")
@@ -89,12 +87,16 @@ var/list/global_huds = list(
vimpaired = newlist(/obj/screen,/obj/screen,/obj/screen,/obj/screen)
O = vimpaired[1]
O.screen_loc = "1,1 to 5,15"
O.plane = PLANE_FULLSCREEN
O = vimpaired[2]
O.screen_loc = "5,1 to 10,5"
O.plane = PLANE_FULLSCREEN
O = vimpaired[3]
O.screen_loc = "6,11 to 10,15"
O.plane = PLANE_FULLSCREEN
O = vimpaired[4]
O.screen_loc = "11,1 to 15,15"
O.plane = PLANE_FULLSCREEN
//welding mask overlay black/dither
darkMask = newlist(/obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen)
@@ -119,18 +121,21 @@ var/list/global_huds = list(
O = vimpaired[i]
O.icon_state = "dither50"
O.layer = 17
O.plane = PLANE_FULLSCREEN
O.mouse_opacity = 0
O = darkMask[i]
O.icon_state = "dither50"
O.layer = 17
O.plane = PLANE_FULLSCREEN
O.mouse_opacity = 0
for(i = 5, i <= 8, i++)
O = darkMask[i]
O.icon_state = "black"
O.layer = 17
O.mouse_opacity = 0
O.plane = PLANE_FULLSCREEN
O.mouse_opacity = 2
/*
The hud datum

22
code/_onclick/hud/human.dm
View File

@@ -13,7 +13,7 @@
src.adding = list()
src.other = list()
src.hotkeybuttons = list() //These can be disabled for hotkey usersx
src.hotkeybuttons = list() //These can be disabled for hotkey users
var/list/hud_elements = list()
var/obj/screen/using
@@ -25,7 +25,6 @@
inv_box = new /obj/screen/inventory()
inv_box.icon = ui_style
inv_box.layer = 19
inv_box.color = ui_color
inv_box.alpha = ui_alpha
@@ -50,7 +49,7 @@
using.icon = ui_style
using.icon_state = "other"
using.screen_loc = ui_inventory
using.layer = 20
using.hud_layerise()
using.color = ui_color
using.alpha = ui_alpha
src.adding += using
@@ -65,7 +64,6 @@
using.screen_loc = ui_acti
using.color = ui_color
using.alpha = ui_alpha
using.layer = 20
src.adding += using
action_intent = using
@@ -82,7 +80,7 @@
using.icon = ico
using.screen_loc = ui_acti
using.alpha = ui_alpha
using.layer = 21
using.layer = LAYER_HUD_ITEM //These sit on the intent box
src.adding += using
help_intent = using
@@ -94,7 +92,7 @@
using.icon = ico
using.screen_loc = ui_acti
using.alpha = ui_alpha
using.layer = 21
using.layer = LAYER_HUD_ITEM
src.adding += using
disarm_intent = using
@@ -106,7 +104,7 @@
using.icon = ico
using.screen_loc = ui_acti
using.alpha = ui_alpha
using.layer = 21
using.layer = LAYER_HUD_ITEM
src.adding += using
grab_intent = using
@@ -118,7 +116,7 @@
using.icon = ico
using.screen_loc = ui_acti
using.alpha = ui_alpha
using.layer = 21
using.layer = LAYER_HUD_ITEM
src.adding += using
hurt_intent = using
//end intent small hud objects
@@ -129,7 +127,6 @@
using.icon = ui_style
using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
using.screen_loc = ui_movi
using.layer = 20
using.color = ui_color
using.alpha = ui_alpha
src.adding += using
@@ -141,7 +138,6 @@
using.icon = ui_style
using.icon_state = "act_drop"
using.screen_loc = ui_drop_throw
using.layer = 19
using.color = ui_color
using.alpha = ui_alpha
src.hotkeybuttons += using
@@ -153,7 +149,6 @@
using.icon = ui_style
using.icon_state = "act_equip"
using.screen_loc = ui_equip
using.layer = 20
using.color = ui_color
using.alpha = ui_alpha
src.adding += using
@@ -167,7 +162,6 @@
inv_box.icon_state = "r_hand_active"
inv_box.screen_loc = ui_rhand
inv_box.slot_id = slot_r_hand
inv_box.layer = 19
inv_box.color = ui_color
inv_box.alpha = ui_alpha
@@ -183,7 +177,6 @@
inv_box.icon_state = "l_hand_active"
inv_box.screen_loc = ui_lhand
inv_box.slot_id = slot_l_hand
inv_box.layer = 19
inv_box.color = ui_color
inv_box.alpha = ui_alpha
src.l_hand_hud_object = inv_box
@@ -194,7 +187,6 @@
using.icon = ui_style
using.icon_state = "hand1"
using.screen_loc = ui_swaphand1
using.layer = 19
using.color = ui_color
using.alpha = ui_alpha
src.adding += using
@@ -204,7 +196,6 @@
using.icon = ui_style
using.icon_state = "hand2"
using.screen_loc = ui_swaphand2
using.layer = 19
using.color = ui_color
using.alpha = ui_alpha
src.adding += using
@@ -215,7 +206,6 @@
using.icon = ui_style
using.icon_state = "act_resist"
using.screen_loc = ui_pull_resist
using.layer = 19
using.color = ui_color
using.alpha = ui_alpha
src.hotkeybuttons += using

2
code/_onclick/hud/robot.dm
View File

@@ -258,7 +258,7 @@ var/obj/screen/robot_inventory
A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7"
else
A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7"
A.layer = 20
A.hud_layerise()
x++
if(x == 4)

3
code/_onclick/hud/screen_objects.dm
View File

@@ -9,7 +9,8 @@
/obj/screen
name = ""
icon = 'icons/mob/screen1.dmi'
layer = 20.0
layer = LAYER_HUD_BASE
plane = PLANE_PLAYER_HUD
unacidable = 1
var/obj/master = null //A reference to the object in the slot. Grabs or items, generally.
var/datum/hud/hud = null // A reference to the owner HUD, if any.