mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Adds SLOT_EARS to various items
This commit is contained in:
@@ -87,6 +87,7 @@
|
|||||||
icon_state = "penlight"
|
icon_state = "penlight"
|
||||||
item_state = ""
|
item_state = ""
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
brightness_on = 2
|
brightness_on = 2
|
||||||
w_class = 1
|
w_class = 1
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
icon_state = "cypherkey"
|
icon_state = "cypherkey"
|
||||||
item_state = ""
|
item_state = ""
|
||||||
w_class = 1
|
w_class = 1
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
var/translate_binary = 0
|
var/translate_binary = 0
|
||||||
var/translate_hive = 0
|
var/translate_hive = 0
|
||||||
var/syndie = 0
|
var/syndie = 0
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
force = 5.0
|
force = 5.0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
throwforce = 5.0
|
throwforce = 5.0
|
||||||
throw_range = 15
|
throw_range = 15
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
|
|||||||
@@ -314,6 +314,7 @@
|
|||||||
icon = 'icons/obj/toy.dmi'
|
icon = 'icons/obj/toy.dmi'
|
||||||
icon_state = "foamdart"
|
icon_state = "foamdart"
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
|
|
||||||
/obj/effect/foam_dart_dummy
|
/obj/effect/foam_dart_dummy
|
||||||
name = ""
|
name = ""
|
||||||
@@ -486,6 +487,8 @@
|
|||||||
icon = 'icons/obj/toy.dmi'
|
icon = 'icons/obj/toy.dmi'
|
||||||
icon_state = "bosunwhistle"
|
icon_state = "bosunwhistle"
|
||||||
var/cooldown = 0
|
var/cooldown = 0
|
||||||
|
w_class = 1
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
|
|
||||||
/obj/item/toy/bosunwhistle/attack_self(mob/user as mob)
|
/obj/item/toy/bosunwhistle/attack_self(mob/user as mob)
|
||||||
if(cooldown < world.time - 35)
|
if(cooldown < world.time - 35)
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
|||||||
var/burnt = 0
|
var/burnt = 0
|
||||||
var/smoketime = 5
|
var/smoketime = 5
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
origin_tech = "materials=1"
|
origin_tech = "materials=1"
|
||||||
attack_verb = list("burnt", "singed")
|
attack_verb = list("burnt", "singed")
|
||||||
|
|
||||||
@@ -210,6 +211,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
|||||||
throw_speed = 0.5
|
throw_speed = 0.5
|
||||||
item_state = "cigoff"
|
item_state = "cigoff"
|
||||||
w_class = 1
|
w_class = 1
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
attack_verb = list("burnt", "singed")
|
attack_verb = list("burnt", "singed")
|
||||||
icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi
|
icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi
|
||||||
icon_off = "cigoff"
|
icon_off = "cigoff"
|
||||||
@@ -294,6 +296,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
|||||||
icon = 'icons/obj/clothing/masks.dmi'
|
icon = 'icons/obj/clothing/masks.dmi'
|
||||||
icon_state = "cigbutt"
|
icon_state = "cigbutt"
|
||||||
w_class = 1
|
w_class = 1
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
throwforce = 1
|
throwforce = 1
|
||||||
|
|
||||||
/obj/item/weapon/cigbutt/New()
|
/obj/item/weapon/cigbutt/New()
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
icon = 'icons/obj/items.dmi'
|
icon = 'icons/obj/items.dmi'
|
||||||
icon_state = "lipstick"
|
icon_state = "lipstick"
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
var/colour = "red"
|
var/colour = "red"
|
||||||
var/open = 0
|
var/open = 0
|
||||||
|
|
||||||
@@ -71,6 +72,7 @@
|
|||||||
name = "purple comb"
|
name = "purple comb"
|
||||||
desc = "A pristine purple comb made from flexible plastic."
|
desc = "A pristine purple comb made from flexible plastic."
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
icon = 'icons/obj/items.dmi'
|
icon = 'icons/obj/items.dmi'
|
||||||
icon_state = "purplecomb"
|
icon_state = "purplecomb"
|
||||||
item_state = "purplecomb"
|
item_state = "purplecomb"
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
var/uses = 1
|
var/uses = 1
|
||||||
var/nofail
|
var/nofail
|
||||||
var/is_bullet = 0
|
var/is_bullet = 0
|
||||||
|
|||||||
@@ -83,6 +83,7 @@
|
|||||||
sharp = 1
|
sharp = 1
|
||||||
edge = 1
|
edge = 1
|
||||||
w_class = 1
|
w_class = 1
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
throwforce = 5.0
|
throwforce = 5.0
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
icon = 'icons/obj/items.dmi'
|
icon = 'icons/obj/items.dmi'
|
||||||
icon_state = "screwdriver"
|
icon_state = "screwdriver"
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT | SLOT_EARS
|
||||||
force = 5.0
|
force = 5.0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throwforce = 5.0
|
throwforce = 5.0
|
||||||
|
|||||||
@@ -119,6 +119,7 @@
|
|||||||
item_state = "paper"
|
item_state = "paper"
|
||||||
throwforce = 1
|
throwforce = 1
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
force = 0.0
|
force = 0.0
|
||||||
throwforce = 0.0
|
throwforce = 0.0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
var/string_attached
|
var/string_attached
|
||||||
var/sides = 2
|
var/sides = 2
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ var/const/MAX_ACTIVE_TIME = 400
|
|||||||
icon = 'icons/mob/alien.dmi'
|
icon = 'icons/mob/alien.dmi'
|
||||||
icon_state = "facehugger"
|
icon_state = "facehugger"
|
||||||
item_state = "facehugger"
|
item_state = "facehugger"
|
||||||
w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
|
w_class = 3 //note: can be picked up by aliens unlike most other items of w_class below 4
|
||||||
flags = MASKCOVERSMOUTH | MASKCOVERSEYES | AIRTIGHT
|
flags = MASKCOVERSMOUTH | MASKCOVERSEYES | AIRTIGHT
|
||||||
body_parts_covered = FACE|EYES
|
body_parts_covered = FACE|EYES
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
icon_state = "soulstone"
|
icon_state = "soulstone"
|
||||||
item_state = "electronic"
|
item_state = "electronic"
|
||||||
desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power."
|
desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power."
|
||||||
w_class = 1.0
|
w_class = 2
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
origin_tech = "bluespace=4;materials=4"
|
origin_tech = "bluespace=4;materials=4"
|
||||||
var/imprinted = "empty"
|
var/imprinted = "empty"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
icon_state = "paper"
|
icon_state = "paper"
|
||||||
item_state = "paper"
|
item_state = "paper"
|
||||||
throwforce = 0
|
throwforce = 0
|
||||||
w_class = 1.0
|
w_class = 2
|
||||||
throw_range = 2
|
throw_range = 2
|
||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
layer = 4
|
layer = 4
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
icon = 'icons/obj/ammo.dmi'
|
icon = 'icons/obj/ammo.dmi'
|
||||||
icon_state = "s-casing"
|
icon_state = "s-casing"
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT | SLOT_EARS
|
||||||
throwforce = 1
|
throwforce = 1
|
||||||
w_class = 1
|
w_class = 1
|
||||||
var/caliber = "" //Which kind of guns it can be loaded into
|
var/caliber = "" //Which kind of guns it can be loaded into
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot
|
var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot
|
||||||
matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375)
|
matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375)
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT | SLOT_EARS
|
||||||
throwforce = 3
|
throwforce = 3
|
||||||
force = 3
|
force = 3
|
||||||
w_class = 1
|
w_class = 1
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
amount_per_transfer_from_this = 5
|
amount_per_transfer_from_this = 5
|
||||||
possible_transfer_amounts = list(1,2,3,4,5)
|
possible_transfer_amounts = list(1,2,3,4,5)
|
||||||
w_class = 1
|
w_class = 1
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
volume = 5
|
volume = 5
|
||||||
|
|
||||||
afterattack(var/obj/target, var/mob/user, var/flag)
|
afterattack(var/obj/target, var/mob/user, var/flag)
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
item_state = "pill"
|
item_state = "pill"
|
||||||
possible_transfer_amounts = null
|
possible_transfer_amounts = null
|
||||||
w_class = 1
|
w_class = 1
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
volume = 60
|
volume = 60
|
||||||
|
|
||||||
New()
|
New()
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
possible_transfer_amounts = null
|
possible_transfer_amounts = null
|
||||||
volume = 15
|
volume = 15
|
||||||
w_class = 1
|
w_class = 1
|
||||||
|
slot_flags = SLOT_EARS
|
||||||
sharp = 1
|
sharp = 1
|
||||||
var/mode = SYRINGE_DRAW
|
var/mode = SYRINGE_DRAW
|
||||||
var/image/filling //holds a reference to the current filling overlay
|
var/image/filling //holds a reference to the current filling overlay
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
icon_state ="spellbook"
|
icon_state ="spellbook"
|
||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
w_class = 1.0
|
w_class = 2
|
||||||
var/uses = 5
|
var/uses = 5
|
||||||
var/temp = null
|
var/temp = null
|
||||||
var/max_uses = 5
|
var/max_uses = 5
|
||||||
|
|||||||
Reference in New Issue
Block a user