mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)
* IT WORKS UP UNTIL THIS POINT * Consolidates SLOT_FLAG and SLOT_HUD into one * Remove cover_both_ears * SLOT_HUD to ITEM_SLOT * Remove clothing_trait changes for the time being * Remove accidental copy-paste * Re-add no-slip var * More failure to copy-paste correctly * Leftover flag * Combine left and right slot flags where possible * UNGOOF MY DEFINES, PHAND IS NOT A THING * Minor spacing changes * Some more fixes from merge * Seperates ITEM SLOT AMOUNT into two defines * ON SECOND THOUGHT LETS NOT DO THAT. * Addresses Contra's review * Thank you GREP * Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES * Added a comment to the bitmasks in clothing defines * Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY * These are for a seperate PR. * Magboot fixes * Requested changes * Re-add accidental removal * Wrong flags * Update code/__DEFINES/clothing_defines.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Chap <erwin@lombok.demon.nl> * Requested changes * Merge fixes * Fix double headset * Fixes multiple accessories --------- Signed-off-by: Chap <erwin@lombok.demon.nl> Co-authored-by: Adrer <adrermail@gmail.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
throw_speed = 3
|
||||
var/obj/item/pen/containedpen
|
||||
var/obj/item/toppaper
|
||||
slot_flags = SLOT_FLAG_BELT
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
resistance_flags = FLAMMABLE
|
||||
|
||||
/obj/item/clipboard/New()
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
throw_range = 1
|
||||
throw_speed = 1
|
||||
pressure_resistance = 0
|
||||
slot_flags = SLOT_FLAG_HEAD
|
||||
slot_flags = ITEM_SLOT_HEAD
|
||||
body_parts_covered = HEAD
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 50
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
icon_state = "pen"
|
||||
item_state = "pen"
|
||||
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
throw_speed = 3
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
icon_state = "camera"
|
||||
item_state = "electropack"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
slot_flags = SLOT_FLAG_BELT
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
var/list/matter = list("metal" = 2000)
|
||||
var/pictures_max = 10
|
||||
// cameras historically were varedited to start with 30 shots despite
|
||||
@@ -633,7 +633,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
|
||||
/obj/item/videocam/advanced
|
||||
name = "advanced video camera"
|
||||
desc = "This video camera allows you to send live feeds even when attached to a belt."
|
||||
slot_flags = SLOT_FLAG_BELT
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
|
||||
#undef CAMERA_STATE_COOLDOWN
|
||||
|
||||
|
||||
Reference in New Issue
Block a user