mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-20 11:47:47 +01:00
[MIRROR] Cleanup (#12525)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
e9da721226
commit
45f04c0a27
@@ -73,7 +73,7 @@
|
||||
light_color = COLOR_WHITE
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
light_on = TRUE
|
||||
blocks_emissive = FALSE
|
||||
blocks_emissive = EMISSIVE_BLOCK_NONE
|
||||
|
||||
/obj/effect/dummy/lighting_obj/Initialize(mapload, _range, _power, _color, _duration)
|
||||
. = ..()
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
alpha = 0
|
||||
vis_flags = NONE
|
||||
blocks_emissive = FALSE
|
||||
blocks_emissive = EMISSIVE_BLOCK_NONE
|
||||
|
||||
/obj/effect/overlay/light_visible/Destroy(force)
|
||||
if(!force)
|
||||
@@ -161,7 +161,7 @@
|
||||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
|
||||
vis_flags = NONE
|
||||
alpha = 110
|
||||
blocks_emissive = FALSE
|
||||
blocks_emissive = EMISSIVE_BLOCK_NONE
|
||||
|
||||
var/static/matrix/normal_transform
|
||||
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
var/digest_stage = null
|
||||
var/d_mult_old = 1 //digest stage descriptions
|
||||
var/d_mult = 1 //digest stage descriptions
|
||||
var/d_stage_overlay //digest stage effects
|
||||
var/image/d_stage_overlay //digest stage effects
|
||||
var/gurgled = FALSE
|
||||
var/oldname
|
||||
var/cleanname
|
||||
@@ -169,6 +169,7 @@
|
||||
M.update_held_icons()
|
||||
|
||||
/obj/item/Destroy()
|
||||
d_stage_overlay = null
|
||||
if(item_tf_spawn_allowed)
|
||||
GLOB.item_tf_spawnpoints -= src
|
||||
if(ismob(loc))
|
||||
|
||||
@@ -357,12 +357,10 @@
|
||||
// Proc: end_video()
|
||||
// Parameters: reason - the text reason to print for why it ended
|
||||
// Description: Ends the video call by clearing video_source
|
||||
/obj/item/communicator/proc/end_video(var/reason)
|
||||
/obj/item/communicator/proc/end_video()
|
||||
UnregisterSignal(video_source, COMSIG_MOVABLE_ATTEMPTED_MOVE)
|
||||
show_static()
|
||||
video_source = null
|
||||
|
||||
. = span_danger("[bicon(src)] [reason ? reason : "Video session ended"].")
|
||||
|
||||
visible_message(.)
|
||||
update_icon()
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
. += "It is full."
|
||||
|
||||
if(!opened && isobserver(user))
|
||||
. += "It contains: [counting_english_list(contents, user)]" //CHOMPEdit
|
||||
. += "It contains: [counting_english_list(user.client, contents)]"
|
||||
|
||||
/obj/structure/closet/CanPass(atom/movable/mover, turf/target)
|
||||
if(wall_mounted)
|
||||
|
||||
@@ -311,7 +311,7 @@
|
||||
icon = 'icons/obj/flora/deadtrees.dmi'
|
||||
icon_state = "tree_sif"
|
||||
base_state = "tree_sif"
|
||||
blocks_emissive = FALSE
|
||||
blocks_emissive = EMISSIVE_BLOCK_NONE
|
||||
product = /obj/item/stack/material/log/sif
|
||||
catalogue_data = list(/datum/category_item/catalogue/flora/sif_tree)
|
||||
randomize_size = TRUE
|
||||
|
||||
Reference in New Issue
Block a user