cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes slot number defines from lowercase to all uppercase (#22297)

Browse Source 
* 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:
Contrabang
2023-10-03 18:27:51 +01:00
committed by GitHub
parent a6a34c2592
commit f3f9bd442a
219 changed files with 1114 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown/ambrosia.dm
+1 -1
View File
@@ -4,7 +4,7 @@
name = "ambrosia branch"
desc = "This is a plant."
icon_state = "ambrosiavulgaris"
slot_flags = SLOT_HEAD
slot_flags = SLOT_FLAG_HEAD
filling_color = "#008000"
bitesize_mod = 2
tastes = list("ambrosia" = 1)
code/modules/hydroponics/grown/flowers.dm
+5 -5
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_HEAD
slot_flags = SLOT_FLAG_HEAD
filling_color = "#FF6347"
bitesize_mod = 3
tastes = list("poppy" = 1)
@@ -93,7 +93,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_HEAD
slot_flags = SLOT_FLAG_HEAD
filling_color = "#E6E6FA"
tastes = list("harebell" = 1)
bitesize_mod = 3
@@ -125,7 +125,7 @@
icon_state = "sunflower"
damtype = "fire"
force = 0
slot_flags = SLOT_HEAD
slot_flags = SLOT_FLAG_HEAD
throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
@@ -154,7 +154,7 @@
name = "moonflower"
desc = "Store in a location at least 50 yards away from werewolves."
icon_state = "moonflower"
slot_flags = SLOT_HEAD
slot_flags = SLOT_FLAG_HEAD
filling_color = "#E6E6FA"
bitesize_mod = 2
tastes = list("moonflower" = 1)
@@ -181,7 +181,7 @@
icon_state = "novaflower"
damtype = "fire"
force = 0
slot_flags = SLOT_HEAD
slot_flags = SLOT_FLAG_HEAD
throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
code/modules/hydroponics/hydroitemdefines.dm
+7 -7
View File
@@ -6,7 +6,7 @@
icon_state = "hydro"
item_state = "analyzer"
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
origin_tech = "magnets=2;biotech=2"
materials = list(MAT_METAL = 210, MAT_GLASS = 40)
@@ -23,7 +23,7 @@
belt_icon = null
volume = 100
container_type = OPENCONTAINER
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
@@ -43,7 +43,7 @@
belt_icon = null
volume = 100
container_type = OPENCONTAINER
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
@@ -127,7 +127,7 @@
w_class = WEIGHT_CLASS_BULKY
flags = CONDUCT
armour_penetration_flat = 20
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
origin_tech = "materials=3;combat=2"
attack_verb = list("chopped", "sliced", "cut", "reaped")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -177,7 +177,7 @@
sharp = FALSE
w_class = WEIGHT_CLASS_SMALL
extend = FALSE
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
origin_tech = "materials=3;combat=3"
attack_verb = list("hit", "poked")
hitsound = "swing_hit"
@@ -186,7 +186,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_BACK //won't fit on belt, but can be worn on belt when extended
slot_flags = SLOT_FLAG_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")
@@ -195,7 +195,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_BELT //can be worn on belt again, but no longer makes sense to wear on the back
slot_flags = SLOT_FLAG_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")