[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:
Chap
2024-11-13 13:02:29 +00:00
committed by GitHub
co-authored by Contrabang Adrer
parent c297dde150
commit d90a70ecda
232 changed files with 1231 additions and 1192 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
name = "ambrosia branch"
desc = "This is a plant."
icon_state = "ambrosiavulgaris"
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
filling_color = "#008000"
bitesize_mod = 2
tastes = list("ambrosia" = 1)
+7 -7
View File
@@ -22,7 +22,7 @@
name = "poppy"
desc = "Long-used as a symbol of rest, peace, and death."
icon_state = "poppy"
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
bitesize_mod = 3
tastes = list("poppy" = 1)
filling_color = "#FF6347"
@@ -45,7 +45,7 @@
name = "lily"
desc = "A beautiful white flower."
icon_state = "lily"
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
bitesize_mod = 3
tastes = list("lily" = 1)
filling_color = "#C7BBAD"
@@ -98,7 +98,7 @@
name = "geranium"
desc = "A beautiful purple flower."
icon_state = "geranium"
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
bitesize_mod = 3
tastes = list("geranium" = 1)
filling_color = "#A463FB"
@@ -128,7 +128,7 @@
name = "harebell"
desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten'd not thy breath.\""
icon_state = "harebell"
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
filling_color = "#E6E6FA"
tastes = list("harebell" = 1)
bitesize_mod = 3
@@ -161,7 +161,7 @@
icon_state = "sunflower"
damtype = "fire"
force = 0
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
@@ -190,7 +190,7 @@
name = "moonflower"
desc = "Store in a location at least 50 yards away from werewolves."
icon_state = "moonflower"
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
filling_color = "#E6E6FA"
bitesize_mod = 2
tastes = list("moonflower" = 1)
@@ -217,7 +217,7 @@
icon_state = "novaflower"
damtype = "fire"
force = 0
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
+7 -7
View File
@@ -6,7 +6,7 @@
icon_state = "hydro"
item_state = "analyzer"
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
origin_tech = "magnets=2;biotech=2"
materials = list(MAT_METAL = 210, MAT_GLASS = 40)
@@ -42,7 +42,7 @@
belt_icon = null
volume = 100
container_type = OPENCONTAINER
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
@@ -63,7 +63,7 @@
belt_icon = null
volume = 100
container_type = OPENCONTAINER
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
@@ -149,7 +149,7 @@
w_class = WEIGHT_CLASS_BULKY
flags = CONDUCT
armour_penetration_flat = 20
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
origin_tech = "materials=3;combat=2"
attack_verb = list("chopped", "sliced", "cut", "reaped")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -199,7 +199,7 @@
sharp = FALSE
w_class = WEIGHT_CLASS_SMALL
extend = FALSE
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
origin_tech = "materials=3;combat=3"
attack_verb = list("hit", "poked")
hitsound = "swing_hit"
@@ -208,7 +208,7 @@
extend = !extend
if(extend)
to_chat(user, "<span class='warning'>With a flick of your wrist, you extend the scythe. It's reaping time!</span>")
slot_flags = SLOT_FLAG_BACK //won't fit on belt, but can be worn on belt when extended
slot_flags = ITEM_SLOT_BACK //won't fit on belt, but can be worn on belt when extended
w_class = WEIGHT_CLASS_BULKY //won't fit in backpacks while extended
force = 15 //slightly better than normal scythe damage
attack_verb = list("chopped", "sliced", "cut", "reaped")
@@ -217,7 +217,7 @@
playsound(src.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1) //Sound credit to Qat of Freesound.org
else
to_chat(user, "<span class='notice'>You collapse the scythe, folding it away for easy storage.</span>")
slot_flags = SLOT_FLAG_BELT //can be worn on belt again, but no longer makes sense to wear on the back
slot_flags = ITEM_SLOT_BELT //can be worn on belt again, but no longer makes sense to wear on the back
w_class = WEIGHT_CLASS_SMALL
force = 3
attack_verb = list("hit", "poked")