cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Neon Carpet (#59140)

Browse Source 
Adds a couple varieties of neon carpet.
Makes decals care about their plane in addition to their layer.
This commit is contained in:
TemporalOroboros
2021-06-13 11:40:53 -07:00
committed by GitHub
parent 4a8c016eee
commit daec5002fc
72 changed files with 1833 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+5 -1
View File
@@ -10,6 +10,7 @@
max_integrity = 200
integrity_failure = 0.25
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 70, ACID = 60)
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
var/icon_door = null
var/icon_door_override = FALSE //override to have open overlay use icon different to its base's
@@ -81,9 +82,12 @@
. = new_overlays
if(opened)
. += "[icon_door_override ? icon_door : icon_state]_open"
var/mutable_appearance/door_blocker = mutable_appearance(icon, "[icon_door || icon_state]_open", plane = EMISSIVE_PLANE)
door_blocker.color = GLOB.em_block_color
. += door_blocker // If we don't do this the door doesn't block emissives and it looks weird.
return
. += "[icon_door || icon_state]_door"
. += mutable_appearance(icon, "[icon_door || icon_state]_door")
if(welded)
. += icon_welded
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+5 -4
View File
@@ -57,10 +57,11 @@
/// Does the MGS ! animation
/atom/proc/do_alert_animation()
var/image/I = image('icons/obj/closet.dmi', src, "cardboard_special", layer+1)
flick_overlay_view(I, src, 8)
I.alpha = 0
animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING)
var/image/alert_image = image('icons/obj/closet.dmi', src, "cardboard_special", layer+1)
alert_image.plane = ABOVE_LIGHTING_PLANE
flick_overlay_view(alert_image, src, 8)
alert_image.alpha = 0
animate(alert_image, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING)
/obj/structure/closet/cardboard/metal
code/game/objects/structures/door_assembly.dm
+3 -3
View File
@@ -273,10 +273,10 @@
/obj/structure/door_assembly/update_overlays()
. = ..()
if(!glass)
. += get_airlock_overlay("fill_construction", icon)
. += get_airlock_overlay("fill_construction", icon, TRUE)
else
. += get_airlock_overlay("glass_construction", overlays_file)
. += get_airlock_overlay("panel_c[state+1]", overlays_file)
. += get_airlock_overlay("glass_construction", overlays_file, TRUE)
. += get_airlock_overlay("panel_c[state+1]", overlays_file, TRUE)
/obj/structure/door_assembly/update_name()
name = ""
code/game/objects/structures/false_walls.dm
+2 -2
View File
@@ -54,9 +54,9 @@
update_appearance()
air_update_turf(TRUE, !density)
/obj/structure/falsewall/update_icon()//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
/obj/structure/falsewall/update_icon(updates=ALL)//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
. = ..()
if(!density)
if(!density || !(updates & UPDATE_SMOOTHING))
return
if(opening)
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -36,7 +36,7 @@
return
. = ..()
if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
if((updates & UPDATE_SMOOTHING) && (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)))
QUEUE_SMOOTH(src)
/obj/structure/grille/update_icon_state()
code/game/objects/structures/statues.dm
+1
View File
@@ -9,6 +9,7 @@
CanAtmosPass = ATMOS_PASS_DENSITY
material_modifier = 0.5
material_flags = MATERIAL_AFFECT_STATISTICS
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
/// Beauty component mood modifier
var/impressiveness = 15
/// Art component subtype added to this statue
code/game/objects/structures/tables_racks.dm
+2 -2
View File
@@ -49,9 +49,9 @@
/obj/structure/table/proc/deconstruction_hints(mob/user)
return "<span class='notice'>The top is <b>screwed</b> on, but the main <b>bolts</b> are also visible.</span>"
/obj/structure/table/update_icon()
/obj/structure/table/update_icon(updates=ALL)
. = ..()
if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
if((updates & UPDATE_SMOOTHING) && (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)))
QUEUE_SMOOTH(src)
QUEUE_SMOOTH_NEIGHBORS(src)
code/game/objects/structures/window.dm
+4 -4
View File
@@ -329,12 +329,12 @@
QUEUE_SMOOTH_NEIGHBORS(src)
//merges adjacent full-tile windows into one
/obj/structure/window/update_overlays()
/obj/structure/window/update_overlays(updates=ALL)
. = ..()
if(QDELETED(src) || !fulltile)
return
if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
if((updates & UPDATE_SMOOTHING) && (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)))
QUEUE_SMOOTH(src)
var/ratio = obj_integrity / max_integrity
@@ -812,9 +812,9 @@
. = ..()
set_opacity(obj_integrity >= max_integrity)
/obj/structure/window/paperframe/update_icon()
/obj/structure/window/paperframe/update_icon(updates=ALL)
. = ..()
if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
if((updates & UPDATE_SMOOTHING) && (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)))
QUEUE_SMOOTH(src)
/obj/structure/window/paperframe/update_overlays()