either destroys the entire game, or increases performance... maybe both (#16178)

This commit is contained in:
ChesterTheCheesy
2022-10-29 16:02:44 +02:00
committed by GitHub
parent 1104e8e4be
commit 4aa6c0b45d
187 changed files with 1412 additions and 1410 deletions

View File

@@ -5,7 +5,7 @@
/datum/component/personal_crafting/proc/create_mob_button(mob/user, client/CL)
var/datum/hud/H = user.hud_used
var/obj/screen/craft/C = new()
var/atom/movable/screen/craft/C = new()
C.icon = H.ui_style
H.static_inventory += C
CL.screen += C
@@ -44,8 +44,8 @@
),
CAT_DRINK = CAT_NONE,
CAT_APPAREL = list(
CAT_CLOTHING,
CAT_ARMOR,
CAT_CLOTHING,
CAT_ARMOR,
CAT_EQUIPMENT
),
)
@@ -335,7 +335,7 @@
/datum/component/personal_crafting/ui_state(mob/user)
return GLOB.not_incapacitated_turf_state
/datum/component/personal_crafting/proc/component_ui_interact(obj/screen/craft/image, location, control, params, user)
/datum/component/personal_crafting/proc/component_ui_interact(atom/movable/screen/craft/image, location, control, params, user)
if(user == parent)
ui_interact(user)

View File

@@ -10,8 +10,8 @@
var/mood_modifier = 1 //Modifier to allow certain mobs to be less affected by moodlets
var/list/datum/mood_event/mood_events = list()
var/insanity_effect = 0 //is the owner being punished for low mood? If so, how much?
var/obj/screen/mood/screen_obj
var/obj/screen/sanity/screen_obj_sanity
var/atom/movable/screen/mood/screen_obj
var/atom/movable/screen/sanity/screen_obj_sanity
/datum/component/mood/Initialize()
if(!isliving(parent))

View File

@@ -42,8 +42,8 @@
var/display_numerical_stacking = FALSE //stack things of the same type and show as a single object with a number.
var/obj/screen/storage/boxes //storage display object
var/obj/screen/close/closer //close button object
var/atom/movable/screen/storage/boxes //storage display object
var/atom/movable/screen/close/closer //close button object
var/allow_big_nesting = FALSE //allow storage objects of the same or greater size.
@@ -547,14 +547,14 @@
if(over_object == M)
user_show_to_mob(M)
if(!M.incapacitated())
if(!istype(over_object, /obj/screen))
if(!istype(over_object, /atom/movable/screen))
dump_content_at(over_object, M)
return
if(A.loc != M)
return
playsound(A, "rustle", 50, 1, -5)
if(istype(over_object, /obj/screen/inventory/hand))
var/obj/screen/inventory/hand/H = over_object
if(istype(over_object, /atom/movable/screen/inventory/hand))
var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(A, H.held_index)
return
A.add_fingerprint(M)