cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +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 13:27:51 -04: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/game/objects/items.dm
+13 -13
View File
@@ -491,7 +491,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
if(!initial)
if(equip_sound && slot == slot_bitfield_to_slot(slot_flags))
playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE)
else if(slot == slot_l_hand || slot == slot_r_hand)
else if(slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)
playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE)
/obj/item/proc/item_action_slot_check(slot, mob/user)
@@ -809,29 +809,29 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
return
var/mob/owner = loc
var/flags = slot_flags
if(flags & SLOT_OCLOTHING)
if(flags & SLOT_FLAG_OCLOTHING)
owner.update_inv_wear_suit()
if(flags & SLOT_ICLOTHING)
if(flags & SLOT_FLAG_ICLOTHING)
owner.update_inv_w_uniform()
if(flags & SLOT_GLOVES)
if(flags & SLOT_FLAG_GLOVES)
owner.update_inv_gloves()
if(flags & SLOT_EYES)
if(flags & SLOT_FLAG_EYES)
owner.update_inv_glasses()
if(flags & SLOT_EARS)
if(flags & SLOT_FLAG_EARS)
owner.update_inv_ears()
if(flags & SLOT_MASK)
if(flags & SLOT_FLAG_MASK)
owner.update_inv_wear_mask()
if(flags & SLOT_HEAD)
if(flags & SLOT_FLAG_HEAD)
owner.update_inv_head()
if(flags & SLOT_FEET)
if(flags & SLOT_FLAG_FEET)
owner.update_inv_shoes()
if(flags & SLOT_ID)
if(flags & SLOT_FLAG_ID)
owner.update_inv_wear_id()
if(flags & SLOT_BELT)
if(flags & SLOT_FLAG_BELT)
owner.update_inv_belt()
if(flags & SLOT_BACK)
if(flags & SLOT_FLAG_BACK)
owner.update_inv_back()
if(flags & SLOT_PDA)
if(flags & SLOT_FLAG_PDA)
owner.update_inv_wear_pda()
/// Called on cyborg items that need special charging behavior. Override as needed for specific items.
code/game/objects/items/crayons.dm
+1 -1
View File
@@ -10,7 +10,7 @@
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonred"
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT | SLOT_EARS
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS
attack_verb = list("attacked", "coloured")
toolspeed = 1
var/colour = COLOR_RED
code/game/objects/items/devices/aicard.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "aicard" // aicard-full
item_state = "electronic"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
flags = NOBLUDGEON
var/flush = null
origin_tech = "programming=3;materials=3"
code/game/objects/items/devices/autopsy.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "autopsy_scanner"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
origin_tech = "magnets=1;biotech=1"
var/list/datum/autopsy_data_scanner/wdata = list()
code/game/objects/items/devices/chameleon_counter.dm
+1 -1
View File
@@ -3,7 +3,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "cham_counter"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
item_state = "electronic"
w_class = WEIGHT_CLASS_SMALL
origin_tech = "syndicate=1;magnets=3"
code/game/objects/items/devices/chameleonproj.dm
+1 -1
View File
@@ -3,7 +3,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "shield0"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
item_state = "electronic"
throwforce = 5
throw_speed = 3
code/game/objects/items/devices/flash.dm
+1 -1
View File
@@ -208,7 +208,7 @@
icon_state = "camera"
item_state = "electropack" //spelling, a coders worst enemy. This part gave me trouble for a while.
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
can_overcharge = FALSE
var/flash_max_charges = 5
var/flash_cur_charges = 5
code/game/objects/items/devices/flashlight.dm
+2 -2
View File
@@ -6,7 +6,7 @@
item_state = "flashlight"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
materials = list(MAT_METAL = 200, MAT_GLASS = 100)
actions_types = list(/datum/action/item_action/toggle_light)
var/on = FALSE
@@ -93,7 +93,7 @@
icon_state = "penlight"
item_state = ""
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT | SLOT_EARS
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS
flags = CONDUCT
brightness_on = 2
var/colour = "blue" // Ink color
code/game/objects/items/devices/geiger_counter.dm
+1 -1
View File
@@ -11,7 +11,7 @@
icon_state = "geiger_off"
item_state = "multitool"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
flags = NOBLUDGEON
materials = list(MAT_METAL = 210, MAT_GLASS = 150)
code/game/objects/items/devices/laserpointer.dm
+1 -1
View File
@@ -6,7 +6,7 @@
item_state = "pen"
var/pointer_icon_state
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
materials = list(MAT_METAL=500, MAT_GLASS=500)
w_class = WEIGHT_CLASS_SMALL //Increased to 2, because diodes are w_class 2. Conservation of matter.
origin_tech = "combat=1;magnets=2"
code/game/objects/items/devices/lightreplacer.dm
+1 -1
View File
@@ -47,7 +47,7 @@
belt_icon = "light_replacer"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
origin_tech = "magnets=3;engineering=4"
force = 8
var/max_uses = 20
code/game/objects/items/devices/paicard.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "pai"
item_state = "electronic"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
origin_tech = "programming=2"
var/request_cooldown = 5 // five seconds
var/last_request
code/game/objects/items/devices/painter/painter.dm
+1 -1
View File
@@ -5,7 +5,7 @@
usesound = 'sound/effects/spray2.ogg'
flags = CONDUCT | NOBLUDGEON
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
materials = list(MAT_METAL = 5000, MAT_GLASS = 2000)
/// Associative list of painter types, with the value being the datum. (For use in the radial menu)
var/static/list/painter_type_list = list(
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "electropack0"
item_state = "electropack"
flags = CONDUCT
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
w_class = WEIGHT_CLASS_HUGE
materials = list(MAT_METAL = 10000, MAT_GLASS = 2500)
/// The integrated signaler
code/game/objects/items/devices/radio/headset.dm
+1 -1
View File
@@ -9,7 +9,7 @@
materials = list(MAT_METAL = 200)
canhear_range = 0 // can't hear headsets from very far away
slot_flags = SLOT_EARS
slot_flags = SLOT_FLAG_EARS
var/translate_binary = FALSE
var/translate_hive = FALSE
var/obj/item/encryptionkey/keyslot1 = null
code/game/objects/items/devices/radio/radio_objects.dm
+1 -1
View File
@@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
var/static/list/blacklisted_areas = list(/area/adminconstruction, /area/tdome)
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throw_speed = 2
throw_range = 9
w_class = WEIGHT_CLASS_SMALL
code/game/objects/items/devices/scanners.dm
+6 -6
View File
@@ -13,7 +13,7 @@ REAGENT SCANNER
icon = 'icons/obj/device.dmi'
icon_state = "t-ray0"
var/on = FALSE
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
materials = list(MAT_METAL = 300)
@@ -91,7 +91,7 @@ REAGENT SCANNER
item_state = "healthanalyzer"
belt_icon = "health_analyzer"
flags = CONDUCT | NOBLUDGEON
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
throwforce = 3
throw_speed = 3
@@ -331,7 +331,7 @@ REAGENT SCANNER
icon = 'icons/obj/device.dmi'
icon_state = "atmos"
item_state = "analyzer"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
throwforce = 0
@@ -473,7 +473,7 @@ REAGENT SCANNER
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throwforce = 5
throw_speed = 4
throw_range = 20
@@ -548,7 +548,7 @@ REAGENT SCANNER
icon_state = "adv_spectrometer_s"
item_state = "analyzer"
origin_tech = "biotech=2"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
throwforce = 0
@@ -602,7 +602,7 @@ REAGENT SCANNER
icon = 'icons/obj/device.dmi'
icon_state = "bodyanalyzer_0"
item_state = "healthanalyser"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
throwforce = 3
throw_speed = 5
code/game/objects/items/devices/sensor_device.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "scanner"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
origin_tech = "programming=3;materials=3;magnets=3"
var/datum/ui_module/crew_monitor/crew_monitor
code/game/objects/items/devices/taperecorder.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "taperecorder_empty"
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
materials = list(MAT_METAL = 180, MAT_GLASS = 90)
force = 2
throwforce = 0
code/game/objects/items/robot/robot_parts.dm
+1 -1
View File
@@ -4,7 +4,7 @@
item_state = "buildpipe"
icon_state = "blank"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
var/list/part = null
var/sabotaged = FALSE //Emagging limbs can have repercussions when installed as prosthetics.
var/model_info = "Unbranded"
code/game/objects/items/tools/crowbar.dm
+1 -1
View File
@@ -7,7 +7,7 @@
belt_icon = "crowbar"
usesound = 'sound/items/crowbar.ogg'
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 5
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
code/game/objects/items/tools/screwdriver.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "screwdriver_map"
belt_icon = "screwdriver"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 5
w_class = WEIGHT_CLASS_TINY
throwforce = 5
code/game/objects/items/tools/welder.dm
+1 -1
View File
@@ -8,7 +8,7 @@
item_state = "welder"
belt_icon = "welder"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 3
throwforce = 5
throw_speed = 3
code/game/objects/items/tools/wirecutters.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "cutters"
belt_icon = "wirecutters_red"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 6
throw_speed = 3
throw_range = 7
code/game/objects/items/tools/wrench.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "wrench"
belt_icon = "wrench"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 5
throwforce = 7
usesound = 'sound/items/ratchet.ogg'
code/game/objects/items/toys.dm
+4 -4
View File
@@ -258,7 +258,7 @@
icon_state = "katana"
item_state = "katana"
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_BACK
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
force = 5
throwforce = 5
w_class = WEIGHT_CLASS_NORMAL
@@ -429,7 +429,7 @@
desc = "This baby looks almost real. Wait, did it just burp?"
force = 5
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
//This should really be somewhere else but I don't know where. w/e
@@ -440,7 +440,7 @@
icon_state = "inflatable"
item_state = "inflatable"
icon = 'icons/obj/clothing/belts.dmi'
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
/*
* Fake meteor
@@ -1118,7 +1118,7 @@
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
hitsound = "swing_hit"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
materials = list(MAT_METAL=2000)
w_class = WEIGHT_CLASS_NORMAL
throwforce = 5
code/game/objects/items/trash.dm
+1 -1
View File
@@ -68,7 +68,7 @@
name = "Kentucky Fried Vox"
icon_state = "fried_vox_empty"
item_state = "fried_vox_empty"
slot_flags = SLOT_HEAD
slot_flags = SLOT_FLAG_HEAD
dog_fashion = /datum/dog_fashion/head/fried_vox_empty
sprite_sheets = list(
"Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
code/game/objects/items/weapons/batons.dm
+3 -3
View File
@@ -10,7 +10,7 @@
desc = "A wooden truncheon for beating criminal scum."
icon_state = "baton"
item_state = "classic_baton"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 12 //9 hit crit
w_class = WEIGHT_CLASS_NORMAL
// Settings
@@ -155,7 +155,7 @@
desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
icon_state = "telebaton_0" // For telling what it is when mapping
item_state = null
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
needs_permit = FALSE
on = FALSE
@@ -197,7 +197,7 @@
else
to_chat(user, "<span class='notice'>You collapse [src].</span>")
item_state = null //no sprite for concealment even when in hand
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
force = force_off //not so robust now
attack_verb = attack_verb_off
code/game/objects/items/weapons/cards_ids.dm
+1 -1
View File
@@ -115,7 +115,7 @@
var/total_mining_points = 0
var/list/access = list()
var/registered_name = "Unknown" // The name registered_name on the card
slot_flags = SLOT_ID
slot_flags = SLOT_FLAG_ID
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
var/untrackable // Can not be tracked by AI's
code/game/objects/items/weapons/chrono_eraser.dm
+2 -2
View File
@@ -7,7 +7,7 @@
icon_state = "chronobackpack"
item_state = "backpack"
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
slowdown = 1
actions_types = list(/datum/action/item_action/equip_unequip_TED_Gun)
var/obj/item/gun/energy/chrono_gun/PA = null
@@ -36,7 +36,7 @@
user.put_in_hands(PA)
/obj/item/chrono_eraser/item_action_slot_check(slot, mob/user)
if(slot == slot_back)
if(slot == SLOT_HUD_BACK)
return 1
code/game/objects/items/weapons/cigs.dm
+2 -2
View File
@@ -19,7 +19,7 @@ LIGHTERS ARE IN LIGHTERS.DM
icon_state = "cigoff"
throw_speed = 0.5
item_state = "cigoff"
slot_flags = SLOT_MASK
slot_flags = SLOT_FLAG_MASK
w_class = WEIGHT_CLASS_TINY
body_parts_covered = null
attack_verb = null
@@ -405,7 +405,7 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/clothing/mask/holo_cigar/equipped(mob/user, slot, initial)
. = ..()
if(enabled && slot == slot_wear_mask)
if(enabled && slot == SLOT_HUD_WEAR_MASK)
if(!HAS_TRAIT_FROM(user, TRAIT_BADASS, HOLO_CIGAR))
ADD_TRAIT(user, TRAIT_BADASS, HOLO_CIGAR)
to_chat(user, "<span class='notice'>You feel more badass while smoking [src].</span>")
code/game/objects/items/weapons/clown_items.dm
+1 -1
View File
@@ -72,7 +72,7 @@
icon_state = "clown_recorder"
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
materials = list(MAT_METAL = 180, MAT_GLASS = 90)
force = 2
throwforce = 0
code/game/objects/items/weapons/defib.dm
+5 -5
View File
@@ -6,7 +6,7 @@
icon = 'icons/obj/defib.dmi'
icon_state = "defibunit"
item_state = "defibunit"
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
force = 5
throwforce = 6
w_class = WEIGHT_CLASS_BULKY
@@ -165,12 +165,12 @@
/obj/item/defibrillator/equipped(mob/user, slot)
..()
if(slot != slot_back)
if(slot != SLOT_HUD_BACK)
remove_paddles(user)
update_icon(UPDATE_OVERLAYS)
/obj/item/defibrillator/item_action_slot_check(slot, mob/user)
if(slot == slot_back)
if(slot == SLOT_HUD_BACK)
return TRUE
/obj/item/defibrillator/proc/remove_paddles(mob/user) // from your hands
@@ -208,7 +208,7 @@
item_state = "defibcompact"
sprite_sheets = null //Because Vox had the belt defibrillator sprites in back.dm
w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
origin_tech = "biotech=5"
/obj/item/defibrillator/compact/loaded/Initialize(mapload)
@@ -217,7 +217,7 @@
update_icon(UPDATE_OVERLAYS)
/obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user)
if(slot == slot_belt)
if(slot == SLOT_HUD_BELT)
return TRUE
/obj/item/defibrillator/compact/combat
code/game/objects/items/weapons/grenades/ghettobomb.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_speed = 3
throw_range = 7
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
active = FALSE
det_time = 5 SECONDS
display_timer = FALSE
code/game/objects/items/weapons/grenades/grenade.dm
+1 -1
View File
@@ -8,7 +8,7 @@
throw_speed = 4
throw_range = 20
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
resistance_flags = FLAMMABLE
max_integrity = 40
var/active = FALSE
code/game/objects/items/weapons/grenades/smokebomb.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "smoke"
det_time = 20
item_state = "smoke"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
var/datum/effect_system/smoke_spread/bad/smoke
/obj/item/grenade/smokebomb/Initialize(mapload)
code/game/objects/items/weapons/handcuffs.dm
+1 -1
View File
@@ -11,7 +11,7 @@
icon_state = "handcuff"
belt_icon = "handcuffs"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throwforce = 5
w_class = WEIGHT_CLASS_SMALL
throw_speed = 2
code/game/objects/items/weapons/highlander_swords.dm
+1 -1
View File
@@ -28,7 +28,7 @@
if(!ishuman(user) || !user.mind)
return
var/mob/living/carbon/human/H = user
if(slot == slot_r_hand || slot == slot_l_hand)
if(slot == SLOT_HUD_RIGHT_HAND || slot == SLOT_HUD_LEFT_HAND)
if(H.mind.martial_art != style)
style.teach(H, TRUE)
to_chat(H, "<span class='notice'>THERE CAN ONLY BE ONE!</span>")
code/game/objects/items/weapons/holy_weapons.dm
+14 -14
View File
@@ -131,7 +131,7 @@
item_state = "godstaff-red"
w_class = WEIGHT_CLASS_HUGE
force = 5
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
/obj/item/nullrod/staff/Initialize(mapload)
. = ..()
@@ -150,7 +150,7 @@
item_state = "claymore"
desc = "A weapon fit for a crusade!"
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK|SLOT_BELT
slot_flags = SLOT_FLAG_BACK|SLOT_FLAG_BELT
sharp = TRUE
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -169,7 +169,7 @@
icon_state = "cultblade"
item_state = "darkbalde"
desc = "Spread the glory of the dark gods!"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
hitsound = 'sound/hallucinations/growl1.ogg'
/obj/item/nullrod/claymore/chainsaw_sword
@@ -177,7 +177,7 @@
icon_state = "chainswordon"
item_state = "chainswordon"
desc = "Suffer not a heretic to live."
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = 'sound/weapons/chainsaw.ogg'
@@ -186,21 +186,21 @@
icon_state = "swordon"
item_state = "swordon"
desc = "The blade glows with the power of faith. Or possibly a battery."
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
/obj/item/nullrod/claymore/katana
name = "hanzo steel"
desc = "Capable of cutting clean through a holy claymore."
icon_state = "katana"
item_state = "katana"
slot_flags = SLOT_BELT | SLOT_BACK
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
/obj/item/nullrod/claymore/multiverse
name = "extradimensional blade"
desc = "Once the harbringer of a interdimensional war, now a dormant souvenir. Still sharp though."
icon_state = "multiverse"
item_state = "multiverse"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
/obj/item/nullrod/claymore/saber
name = "light energy blade"
@@ -208,7 +208,7 @@
icon_state = "swordblue"
item_state = "swordblue"
desc = "If you strike me down, I shall become more robust than you can possibly imagine."
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
/obj/item/nullrod/claymore/saber/red
name = "dark energy blade"
@@ -227,7 +227,7 @@
desc = "This thing is so unspeakably HOLY you are having a hard time even holding it."
icon_state = "sord"
item_state = "sord"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 4.13
throwforce = 1
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -240,7 +240,7 @@
desc = "Ask not for whom the bell tolls..."
w_class = WEIGHT_CLASS_BULKY
armour_penetration_flat = 30
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
sharp = TRUE
attack_verb = list("chopped", "sliced", "cut", "reaped")
hitsound = 'sound/weapons/rapierhit.ogg'
@@ -375,7 +375,7 @@
icon_state = "hammeron"
item_state = "hammeron"
desc = "This war hammer cost the chaplain fourty thousand space dollars."
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_HUGE
attack_verb = list("smashed", "bashed", "hammered", "crunched")
@@ -408,7 +408,7 @@
desc = "The brim of the hat is as sharp as the division between 0 and 1. It makes a mighty throwing weapon."
icon_state = "fedora"
item_state = "fedora"
slot_flags = SLOT_HEAD
slot_flags = SLOT_FLAG_HEAD
icon = 'icons/obj/clothing/hats.dmi'
force = 0
throw_speed = 4
@@ -465,7 +465,7 @@
item_state = "bostaff0"
w_class = WEIGHT_CLASS_BULKY
force = 13
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
sharp = FALSE
hitsound = "swing_hit"
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
@@ -619,7 +619,7 @@
item_state = "godstaff-red"
w_class = WEIGHT_CLASS_HUGE
force = 5
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
var/team_color = "red"
var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null //the robes linked with this staff
code/game/objects/items/weapons/lighters.dm
+2 -2
View File
@@ -10,7 +10,7 @@
w_class = WEIGHT_CLASS_TINY
throwforce = 4
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
attack_verb = null
resistance_flags = FIRE_PROOF
var/lit = FALSE
@@ -300,7 +300,7 @@
return ..()
/obj/item/proc/help_light_cig(mob/living/M)
var/mask_item = M.get_item_by_slot(slot_wear_mask)
var/mask_item = M.get_item_by_slot(SLOT_HUD_WEAR_MASK)
if(istype(mask_item, /obj/item/clothing/mask/cigarette))
return mask_item
code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+1 -1
View File
@@ -292,7 +292,7 @@
inhand_y_dimension = 64
icon_state = "cleaving_saw"
icon_state_on = "cleaving_saw_open"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
var/attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut")
attack_verb_on = list("cleaved", "swiped", "slashed", "chopped")
hitsound = 'sound/weapons/bladeslice.ogg'
code/game/objects/items/weapons/melee/melee_misc.dm
+1 -1
View File
@@ -9,7 +9,7 @@
icon_state = "chain"
item_state = "chain"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 10
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
code/game/objects/items/weapons/shields.dm
+2 -2
View File
@@ -20,7 +20,7 @@
name = "riot shield"
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
icon_state = "riot"
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
force = 10
throwforce = 5
throw_speed = 2
@@ -154,7 +154,7 @@
throwforce = 5
throw_speed = 2
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
to_chat(user, "<span class='notice'>You extend \the [src].</span>")
else
force = 3
code/game/objects/items/weapons/storage/backpack.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/storage/bags.dm
+6 -6
View File
@@ -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
code/game/objects/items/weapons/storage/belt.dm
+1 -1
View File
@@ -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'
code/game/objects/items/weapons/storage/boxes.dm
+1 -1
View File
@@ -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)
code/game/objects/items/weapons/storage/fancy.dm
+3 -3
View File
@@ -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
code/game/objects/items/weapons/storage/wallets.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/stunbaton.dm
+3 -3
View File
@@ -5,7 +5,7 @@
var/base_icon = "stunbaton"
item_state = null
belt_icon = "stunbaton"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 10
throwforce = 7
origin_tech = "combat=2"
@@ -83,7 +83,7 @@
return cell
/obj/item/melee/baton/mob_can_equip(mob/user, slot, disable_warning = TRUE)
if(turned_on && (slot == slot_belt || slot == slot_s_store))
if(turned_on && (slot == SLOT_HUD_BELT || slot == SLOT_HUD_SUIT_STORE))
to_chat(user, "<span class='warning'>You can't equip [src] while it's active!</span>")
return FALSE
return ..(user, slot, disable_warning = TRUE) // call parent but disable warning
@@ -293,7 +293,7 @@
knockdown_duration = 6 SECONDS
w_class = WEIGHT_CLASS_BULKY
hitcost = 2000
slot_flags = SLOT_BACK | SLOT_BELT
slot_flags = SLOT_FLAG_BACK | SLOT_FLAG_BELT
var/obj/item/assembly/igniter/sparkler = null
/obj/item/melee/baton/cattleprod/Initialize(mapload)
code/game/objects/items/weapons/tanks/tank_types.dm
+2 -2
View File
@@ -103,7 +103,7 @@
/obj/item/tank/internals/plasmaman/belt
icon_state = "plasmaman_tank_belt"
item_state = "plasmaman_tank_belt"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 5
volume = 35
w_class = WEIGHT_CLASS_SMALL
@@ -130,7 +130,7 @@
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
icon_state = "emergency"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
force = 4
distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
code/game/objects/items/weapons/tanks/tanks.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "tank"
icon = 'icons/obj/tank.dmi'
flags = CONDUCT
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
hitsound = 'sound/weapons/smash.ogg'
w_class = WEIGHT_CLASS_NORMAL
pressure_resistance = ONE_ATMOSPHERE * 5
code/game/objects/items/weapons/tanks/watertank.dm
+4 -4
View File
@@ -6,7 +6,7 @@
icon_state = "waterbackpack"
item_state = "waterbackpack"
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
slowdown = 1
actions_types = list(/datum/action/item_action/toggle_mister)
max_integrity = 200
@@ -30,13 +30,13 @@
toggle_mister()
/obj/item/watertank/item_action_slot_check(slot, mob/user)
if(slot == slot_back)
if(slot == SLOT_HUD_BACK)
return 1
/obj/item/watertank/verb/toggle_mister()
set name = "Toggle Mister"
set category = "Object"
if(usr.get_item_by_slot(slot_back) != src)
if(usr.get_item_by_slot(SLOT_HUD_BACK) != src)
to_chat(usr, "<span class='notice'>The watertank needs to be on your back to use.</span>")
return
if(usr.incapacitated())
@@ -64,7 +64,7 @@
/obj/item/watertank/equipped(mob/user, slot)
..()
if(slot != slot_back)
if(slot != SLOT_HUD_BACK)
remove_noz()
/obj/item/watertank/proc/remove_noz()
code/game/objects/items/weapons/tape.dm
+1 -1
View File
@@ -38,7 +38,7 @@
user.visible_message("<span class='warning'>[user] tapes [M]'s mouth shut!</span>",
"<span class='notice'>You cover [M == user ? "your own" : "[M]'s"] mouth with a piece of duct tape.[M == user ? null : " That will shut them up."]</span>")
var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag
M.equip_to_slot(G, slot_wear_mask)
M.equip_to_slot(G, SLOT_HUD_WEAR_MASK)
G.add_fingerprint(user)
/obj/item/stack/tape_roll/update_icon_state()
code/game/objects/items/weapons/twohanded.dm
+7 -7
View File
@@ -12,7 +12,7 @@
throwforce = 15
sharp = TRUE
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
toolspeed = 0.25
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -234,7 +234,7 @@
desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
force = 10
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
var/force_unwielded = 10
var/force_wielded = 18
throwforce = 20
@@ -542,7 +542,7 @@
icon_state = "singulohammer0"
base_icon_state = "singulohammer"
flags = CONDUCT
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
force = 5
throwforce = 15
throw_range = 1
@@ -613,7 +613,7 @@
icon_state = "mjollnir0"
base_icon_state = "mjollnir"
flags = CONDUCT
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
force = 5
throwforce = 30
throw_range = 7
@@ -660,7 +660,7 @@
icon_state = "knighthammer0"
base_icon_state = "knighthammer"
flags = CONDUCT
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
force = 5
throwforce = 15
throw_range = 1
@@ -808,7 +808,7 @@
. += "<span class='warning'>It is missing a pyroclastic anomaly core.</span>"
/obj/item/clothing/gloves/color/black/pyro_claws/item_action_slot_check(slot)
if(slot == slot_gloves)
if(slot == SLOT_HUD_GLOVES)
return TRUE
/obj/item/clothing/gloves/color/black/pyro_claws/ui_action_click(mob/user)
@@ -1018,7 +1018,7 @@
sharp = TRUE
damtype = BURN
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
throwforce = 15
toolspeed = 0.25
attack_verb = list("enlightened", "enforced", "cleaved", "stabbed", "whacked")
code/game/objects/items/weapons/weaponry.dm
+4 -4
View File
@@ -6,7 +6,7 @@
name = "banhammer"
icon = 'icons/obj/items.dmi'
icon_state = "toyhammer"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 7
@@ -32,7 +32,7 @@
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
icon_state = "sord"
item_state = "sord"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 2
throwforce = 1
w_class = WEIGHT_CLASS_NORMAL
@@ -51,7 +51,7 @@
item_state = "claymore"
flags = CONDUCT
hitsound = 'sound/weapons/bladeslice.ogg'
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 40
throwforce = 10
sharp = TRUE
@@ -82,7 +82,7 @@
icon_state = "katana"
item_state = "katana"
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_BACK
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
force = 40
throwforce = 10
sharp = TRUE
code/game/objects/mail.dm
+1 -1
View File
@@ -219,7 +219,7 @@
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
origin_tech = "magnets=1"
/// The reference to the envelope that is currently stored in the mail scanner. It will be cleared upon confirming a correct delivery
code/game/objects/structures/bedsheet_bin.dm
+1 -1
View File
@@ -19,7 +19,7 @@ LINEN BINS
w_class = WEIGHT_CLASS_TINY
item_color = "white"
resistance_flags = FLAMMABLE
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
dog_fashion = /datum/dog_fashion/head/ghost
var/list/dream_messages = list("white")