mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-31 07:57:47 +01:00
Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it * flags * back * head/mask * left * right * Cuffs * other name changes * ID and PDA * idk about calling them SLOT_HUD now * glasses, gloves, and shoes, oh my! * the rest * comment
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
slot_flags = SLOT_BACK //ERROOOOO
|
||||
slot_flags = SLOT_FLAG_BACK //ERROOOOO
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
max_combined_w_class = 21
|
||||
storage_slots = 21
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
allow_quick_empty = 1
|
||||
display_contents_with_number = 1 // should work fine now
|
||||
use_to_pickup = 1
|
||||
slot_flags = SLOT_BELT
|
||||
slot_flags = SLOT_FLAG_BELT
|
||||
|
||||
// -----------------------------
|
||||
// Trash bag
|
||||
@@ -121,7 +121,7 @@
|
||||
icon = 'icons/obj/trash.dmi'
|
||||
icon_state = "plasticbag"
|
||||
item_state = "plasticbag"
|
||||
slot_flags = SLOT_HEAD|SLOT_BELT
|
||||
slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_BELT
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_SMALL
|
||||
@@ -132,14 +132,14 @@
|
||||
|
||||
/obj/item/storage/bag/plasticbag/mob_can_equip(M as mob, slot)
|
||||
|
||||
if(slot==slot_head && contents.len)
|
||||
if(slot==SLOT_HUD_HEAD && contents.len)
|
||||
to_chat(M, "<span class='warning'>You need to empty the bag first!</span>")
|
||||
return 0
|
||||
return ..()
|
||||
|
||||
|
||||
/obj/item/storage/bag/plasticbag/equipped(mob/user, slot)
|
||||
if(slot==slot_head)
|
||||
if(slot==SLOT_HUD_HEAD)
|
||||
storage_slots = 0
|
||||
START_PROCESSING(SSobj, src)
|
||||
return
|
||||
@@ -148,7 +148,7 @@
|
||||
if(is_equipped())
|
||||
if(ishuman(loc))
|
||||
var/mob/living/carbon/human/H = loc
|
||||
if(H.get_item_by_slot(slot_head) == src)
|
||||
if(H.get_item_by_slot(SLOT_HUD_HEAD) == src)
|
||||
if(H.internal)
|
||||
return
|
||||
H.AdjustLoseBreath(2 SECONDS)
|
||||
@@ -167,7 +167,7 @@
|
||||
icon = 'icons/obj/mining.dmi'
|
||||
icon_state = "satchel"
|
||||
origin_tech = "engineering=2"
|
||||
slot_flags = SLOT_BELT | SLOT_POCKET
|
||||
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
storage_slots = 10
|
||||
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
item_state = "utility"
|
||||
lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
|
||||
slot_flags = SLOT_BELT
|
||||
slot_flags = SLOT_FLAG_BELT
|
||||
attack_verb = list("whipped", "lashed", "disciplined")
|
||||
max_integrity = 300
|
||||
equip_sound = 'sound/items/equip/toolbelt_equip.ogg'
|
||||
|
||||
@@ -622,7 +622,7 @@
|
||||
storage_slots = 10
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
max_w_class = WEIGHT_CLASS_TINY
|
||||
slot_flags = SLOT_BELT
|
||||
slot_flags = SLOT_FLAG_BELT
|
||||
drop_sound = 'sound/items/handling/matchbox_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
|
||||
can_hold = list(/obj/item/match)
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
item_state = "candlebox5"
|
||||
storage_slots = 5
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
slot_flags = SLOT_FLAG_BELT
|
||||
|
||||
|
||||
/obj/item/storage/fancy/candle_box/full/populate_contents()
|
||||
@@ -173,7 +173,7 @@
|
||||
belt_icon = "patch_pack"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
slot_flags = SLOT_FLAG_BELT
|
||||
storage_slots = 6
|
||||
max_combined_w_class = 6
|
||||
can_hold = list(/obj/item/clothing/mask/cigarette,
|
||||
@@ -202,7 +202,7 @@
|
||||
var/obj/item/I = contents[num]
|
||||
if(istype(I, /obj/item/clothing/mask/cigarette))
|
||||
var/obj/item/clothing/mask/cigarette/C = I
|
||||
user.equip_to_slot_if_possible(C, slot_wear_mask)
|
||||
user.equip_to_slot_if_possible(C, SLOT_HUD_WEAR_MASK)
|
||||
to_chat(user, "<span class='notice'>You take \a [C.name] out of the pack.</span>")
|
||||
update_icon()
|
||||
got_cig = 1
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
cant_hold = list(
|
||||
/obj/item/screwdriver/power
|
||||
)
|
||||
slot_flags = SLOT_ID
|
||||
slot_flags = SLOT_FLAG_ID
|
||||
|
||||
var/obj/item/card/id/front_id = null
|
||||
|
||||
|
||||
Reference in New Issue
Block a user