mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
Planes Framework (#4545)
* Polaris initial plane upstream merge * POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT * POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays. * POLARIS: Adds a 'alter values' proc for plane master ease of tweaking Setting stuff like colorblindness variety and things. * Remove NIF reference, fix lighting layer define * Handle effects above lighting plane * Moved all layer defines to planes+layers.dm * Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE * Merge: 3000% human/update_icons() speed improvement * Merge: Avoid ghosts pointing at things
This commit is contained in:
@@ -169,7 +169,7 @@
|
||||
if(H == user)
|
||||
user << "<span class='notice'>You wipe off the lipstick with [src].</span>"
|
||||
H.lip_style = null
|
||||
H.update_body()
|
||||
H.update_icons_body()
|
||||
else
|
||||
user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
|
||||
"<span class='notice'>You begin to wipe off [H]'s lipstick.</span>")
|
||||
@@ -177,7 +177,7 @@
|
||||
user.visible_message("<span class='notice'>[user] wipes [H]'s lipstick off with \the [src].</span>", \
|
||||
"<span class='notice'>You wipe off [H]'s lipstick.</span>")
|
||||
H.lip_style = null
|
||||
H.update_body()
|
||||
H.update_icons_body()
|
||||
|
||||
/obj/item/weapon/paper/proc/addtofield(var/id, var/text, var/links = 0)
|
||||
var/locid = 0
|
||||
@@ -448,13 +448,13 @@
|
||||
else if (h_user.l_store == src)
|
||||
h_user.drop_from_inventory(src)
|
||||
B.loc = h_user
|
||||
B.layer = 20
|
||||
B.hud_layerise()
|
||||
h_user.l_store = B
|
||||
h_user.update_inv_pockets()
|
||||
else if (h_user.r_store == src)
|
||||
h_user.drop_from_inventory(src)
|
||||
B.loc = h_user
|
||||
B.layer = 20
|
||||
B.hud_layerise()
|
||||
h_user.r_store = B
|
||||
h_user.update_inv_pockets()
|
||||
else if (h_user.head == src)
|
||||
|
||||
Reference in New Issue
Block a user