mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
passed over everything with throwforce
This commit is contained in:
@@ -95,7 +95,7 @@
|
|||||||
icon = 'icons/obj/items.dmi'
|
icon = 'icons/obj/items.dmi'
|
||||||
icon_state = "bike_horn"
|
icon_state = "bike_horn"
|
||||||
item_state = "bike_horn"
|
item_state = "bike_horn"
|
||||||
throwforce = 3
|
throwforce = 0
|
||||||
hitsound = null //To prevent tap.ogg playing, as the item lacks of force
|
hitsound = null //To prevent tap.ogg playing, as the item lacks of force
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
@@ -112,7 +112,7 @@
|
|||||||
desc = "A tube... of cardboard."
|
desc = "A tube... of cardboard."
|
||||||
icon = 'icons/obj/items.dmi'
|
icon = 'icons/obj/items.dmi'
|
||||||
icon_state = "c_tube"
|
icon_state = "c_tube"
|
||||||
throwforce = 1
|
throwforce = 0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throw_speed = 4
|
throw_speed = 4
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
@@ -125,7 +125,7 @@
|
|||||||
icon_state = "cane"
|
icon_state = "cane"
|
||||||
item_state = "stick"
|
item_state = "stick"
|
||||||
force = 5.0
|
force = 5.0
|
||||||
throwforce = 7.0
|
throwforce = 5
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
m_amt = 50
|
m_amt = 50
|
||||||
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
|
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
icon = 'icons/obj/aibots.dmi'
|
icon = 'icons/obj/aibots.dmi'
|
||||||
icon_state = "bucket_proxy"
|
icon_state = "bucket_proxy"
|
||||||
force = 3.0
|
force = 3.0
|
||||||
throwforce = 10.0
|
throwforce = 5.0
|
||||||
throw_speed = 2
|
throw_speed = 2
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
w_class = 3.0
|
w_class = 3.0
|
||||||
|
|||||||
@@ -407,7 +407,7 @@
|
|||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
force = 5.0
|
force = 5.0
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
throwforce = 5.0
|
throwforce = 0
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
throw_range = 15
|
throw_range = 15
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
desc = "A powerful and versatile flashbulb device, with applications ranging from disorienting attackers to acting as visual receptors in robot production."
|
desc = "A powerful and versatile flashbulb device, with applications ranging from disorienting attackers to acting as visual receptors in robot production."
|
||||||
icon_state = "flash"
|
icon_state = "flash"
|
||||||
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
|
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
|
||||||
throwforce = 5
|
throwforce = 0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throw_speed = 4
|
throw_speed = 4
|
||||||
throw_range = 10
|
throw_range = 10
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
icon_state = "multitool"
|
icon_state = "multitool"
|
||||||
force = 5.0
|
force = 5.0
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
throwforce = 5.0
|
throwforce = 0
|
||||||
throw_range = 15
|
throw_range = 15
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
m_amt = 50
|
m_amt = 50
|
||||||
|
|||||||
@@ -169,7 +169,7 @@ MASS SPECTROMETER
|
|||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
throwforce = 5
|
throwforce = 0
|
||||||
throw_speed = 4
|
throw_speed = 4
|
||||||
throw_range = 20
|
throw_range = 20
|
||||||
m_amt = 30
|
m_amt = 30
|
||||||
@@ -236,7 +236,7 @@ MASS SPECTROMETER
|
|||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
flags = CONDUCT | OPENCONTAINER
|
flags = CONDUCT | OPENCONTAINER
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
throwforce = 5
|
throwforce = 0
|
||||||
throw_speed = 4
|
throw_speed = 4
|
||||||
throw_range = 20
|
throw_range = 20
|
||||||
m_amt = 30
|
m_amt = 30
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
m_amt = 60
|
m_amt = 60
|
||||||
g_amt = 30
|
g_amt = 30
|
||||||
force = 2
|
force = 2
|
||||||
throwforce = 2
|
throwforce = 0
|
||||||
var/recording = 0
|
var/recording = 0
|
||||||
var/playing = 0
|
var/playing = 0
|
||||||
var/playsleepseconds = 0
|
var/playsleepseconds = 0
|
||||||
@@ -265,7 +265,7 @@
|
|||||||
m_amt = 20
|
m_amt = 20
|
||||||
g_amt = 5
|
g_amt = 5
|
||||||
force = 1
|
force = 1
|
||||||
throwforce = 1
|
throwforce = 0
|
||||||
var/max_capacity = 600
|
var/max_capacity = 600
|
||||||
var/used_capacity = 0
|
var/used_capacity = 0
|
||||||
var/list/storedinfo = list()
|
var/list/storedinfo = list()
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
|
|||||||
singular_name = "metal sheet"
|
singular_name = "metal sheet"
|
||||||
icon_state = "sheet-metal"
|
icon_state = "sheet-metal"
|
||||||
m_amt = 3750
|
m_amt = 3750
|
||||||
throwforce = 14.0
|
throwforce = 10.0
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
origin_tech = "materials=1"
|
origin_tech = "materials=1"
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ AI MODULES
|
|||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
force = 5.0
|
force = 5.0
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
throwforce = 5.0
|
throwforce = 0
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
throw_range = 15
|
throw_range = 15
|
||||||
origin_tech = "programming=3"
|
origin_tech = "programming=3"
|
||||||
|
|||||||
@@ -302,7 +302,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
|
||||||
throwforce = 1
|
throwforce = 0
|
||||||
|
|
||||||
/obj/item/weapon/cigbutt/cigarbutt
|
/obj/item/weapon/cigbutt/cigarbutt
|
||||||
name = "cigar butt"
|
name = "cigar butt"
|
||||||
@@ -411,7 +411,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
|||||||
var/icon_on = "lighter-g-on"
|
var/icon_on = "lighter-g-on"
|
||||||
var/icon_off = "lighter-g"
|
var/icon_off = "lighter-g"
|
||||||
w_class = 1
|
w_class = 1
|
||||||
throwforce = 4
|
throwforce = 0
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
attack_verb = null
|
attack_verb = null
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
icon_state = "handcuff"
|
icon_state = "handcuff"
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
throwforce = 5
|
throwforce = 0
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
throw_speed = 2
|
throw_speed = 2
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
/obj/item/weapon/kitchen/utensil
|
/obj/item/weapon/kitchen/utensil
|
||||||
force = 5.0
|
force = 5.0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throwforce = 5.0
|
throwforce = 0
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
@@ -154,7 +154,7 @@
|
|||||||
desc = "Used to knock out the Bartender."
|
desc = "Used to knock out the Bartender."
|
||||||
icon_state = "rolling_pin"
|
icon_state = "rolling_pin"
|
||||||
force = 8.0
|
force = 8.0
|
||||||
throwforce = 10.0
|
throwforce = 5.0
|
||||||
throw_speed = 2
|
throw_speed = 2
|
||||||
throw_range = 7
|
throw_range = 7
|
||||||
w_class = 3.0
|
w_class = 3.0
|
||||||
@@ -200,7 +200,6 @@
|
|||||||
icon = 'icons/obj/food.dmi'
|
icon = 'icons/obj/food.dmi'
|
||||||
icon_state = "tray"
|
icon_state = "tray"
|
||||||
desc = "A metal tray to lay food on."
|
desc = "A metal tray to lay food on."
|
||||||
throwforce = 12.0
|
|
||||||
throwforce = 10.0
|
throwforce = 10.0
|
||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
icon = 'icons/obj/janitor.dmi'
|
icon = 'icons/obj/janitor.dmi'
|
||||||
icon_state = "mop"
|
icon_state = "mop"
|
||||||
force = 3.0
|
force = 3.0
|
||||||
throwforce = 10.0
|
throwforce = 5.0
|
||||||
throw_speed = 5
|
throw_speed = 5
|
||||||
throw_range = 10
|
throw_range = 10
|
||||||
w_class = 3.0
|
w_class = 3.0
|
||||||
|
|||||||
@@ -150,7 +150,7 @@
|
|||||||
icon_state = "cigpacket"
|
icon_state = "cigpacket"
|
||||||
item_state = "cigpacket"
|
item_state = "cigpacket"
|
||||||
w_class = 1
|
w_class = 1
|
||||||
throwforce = 2
|
throwforce = 0
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
storage_slots = 6
|
storage_slots = 6
|
||||||
can_hold = list("/obj/item/clothing/mask/cigarette")
|
can_hold = list("/obj/item/clothing/mask/cigarette")
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
var/crit_fail = 0
|
var/crit_fail = 0
|
||||||
var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
|
var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
|
||||||
animate_movement = 2
|
animate_movement = 2
|
||||||
var/throwforce = 1
|
var/throwforce = 0
|
||||||
var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
|
var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
|
||||||
var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
|
var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ LINEN BINS
|
|||||||
item_state = "bedsheet"
|
item_state = "bedsheet"
|
||||||
slot_flags = SLOT_BACK
|
slot_flags = SLOT_BACK
|
||||||
layer = 4.0
|
layer = 4.0
|
||||||
throwforce = 1
|
throwforce 0
|
||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 2
|
throw_range = 2
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
/obj/item/clothing/ears
|
/obj/item/clothing/ears
|
||||||
name = "ears"
|
name = "ears"
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throwforce = 2
|
throwforce = 0
|
||||||
slot_flags = SLOT_EARS
|
slot_flags = SLOT_EARS
|
||||||
|
|
||||||
/obj/item/clothing/ears/earmuffs
|
/obj/item/clothing/ears/earmuffs
|
||||||
|
|||||||
@@ -91,7 +91,7 @@
|
|||||||
damtype = "fire"
|
damtype = "fire"
|
||||||
force = 0
|
force = 0
|
||||||
slot_flags = SLOT_HEAD
|
slot_flags = SLOT_HEAD
|
||||||
throwforce = 1
|
throwforce = 0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 3
|
throw_range = 3
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
damtype = "fire"
|
damtype = "fire"
|
||||||
force = 0
|
force = 0
|
||||||
slot_flags = SLOT_HEAD
|
slot_flags = SLOT_HEAD
|
||||||
throwforce = 1
|
throwforce = 0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 3
|
throw_range = 3
|
||||||
@@ -128,7 +128,7 @@
|
|||||||
damtype = "fire"
|
damtype = "fire"
|
||||||
force = 15
|
force = 15
|
||||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||||
throwforce = 1
|
throwforce = 5
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 3
|
throw_range = 3
|
||||||
@@ -150,7 +150,7 @@
|
|||||||
damtype = "fire"
|
damtype = "fire"
|
||||||
force = 30
|
force = 30
|
||||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||||
throwforce = 1
|
throwforce = 15
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 3
|
throw_range = 3
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
item_state = "spray"
|
item_state = "spray"
|
||||||
flags = OPENCONTAINER
|
flags = OPENCONTAINER
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
throwforce = 4
|
throwforce = 0
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
throw_speed = 2
|
throw_speed = 2
|
||||||
throw_range = 10
|
throw_range = 10
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
item_state = "spray"
|
item_state = "spray"
|
||||||
flags = OPENCONTAINER
|
flags = OPENCONTAINER
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
throwforce = 4
|
throwforce = 0
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
throw_speed = 2
|
throw_speed = 2
|
||||||
throw_range = 10
|
throw_range = 10
|
||||||
|
|||||||
@@ -64,7 +64,7 @@
|
|||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
force = 15.0
|
force = 15.0
|
||||||
throwforce = 4.0
|
throwforce = 10.0
|
||||||
item_state = "pickaxe"
|
item_state = "pickaxe"
|
||||||
w_class = 4.0
|
w_class = 4.0
|
||||||
m_amt = 3750 //one sheet, but where can you make them?
|
m_amt = 3750 //one sheet, but where can you make them?
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
icon_state = "moneybag"
|
icon_state = "moneybag"
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
force = 10.0
|
force = 10.0
|
||||||
throwforce = 2.0
|
throwforce = 0
|
||||||
w_class = 4.0
|
w_class = 4.0
|
||||||
|
|
||||||
/obj/item/weapon/moneybag/attack_hand(user as mob)
|
/obj/item/weapon/moneybag/attack_hand(user as mob)
|
||||||
|
|||||||
@@ -118,7 +118,7 @@
|
|||||||
icon_state = "coin"
|
icon_state = "coin"
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
force = 1
|
force = 1
|
||||||
throwforce = 3
|
throwforce = 0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
var/string_attached
|
var/string_attached
|
||||||
var/list/sideslist = list("heads","tails")
|
var/list/sideslist = list("heads","tails")
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
icon_state = "brain"
|
icon_state = "brain"
|
||||||
force = 1.0
|
force = 1.0
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
throwforce = 1.0
|
throwforce = 0
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
origin_tech = "biotech=3"
|
origin_tech = "biotech=3"
|
||||||
|
|||||||
@@ -575,7 +575,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
|
|||||||
icon_state = "grey slime extract"
|
icon_state = "grey slime extract"
|
||||||
force = 1.0
|
force = 1.0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
throwforce = 1.0
|
throwforce = 0
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
throw_range = 6
|
throw_range = 6
|
||||||
origin_tech = "biotech=4"
|
origin_tech = "biotech=4"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
icon = 'icons/obj/bureaucracy.dmi'
|
icon = 'icons/obj/bureaucracy.dmi'
|
||||||
icon_state = "paper_bin1"
|
icon_state = "paper_bin1"
|
||||||
item_state = "sheet-metal"
|
item_state = "sheet-metal"
|
||||||
throwforce = 1
|
throwforce = 0
|
||||||
w_class = 3
|
w_class = 3
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
throw_range = 7
|
throw_range = 7
|
||||||
|
|||||||
@@ -202,7 +202,7 @@
|
|||||||
amount = MAXCOIL
|
amount = MAXCOIL
|
||||||
item_color = "red"
|
item_color = "red"
|
||||||
desc = "A coil of power cable."
|
desc = "A coil of power cable."
|
||||||
throwforce = 10
|
throwforce = 0
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
throw_speed = 2
|
throw_speed = 2
|
||||||
throw_range = 5
|
throw_range = 5
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
icon_state = "s-casing"
|
icon_state = "s-casing"
|
||||||
flags = CONDUCT
|
flags = CONDUCT
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
throwforce = 1
|
throwforce = 0
|
||||||
w_class = 1.0
|
w_class = 1.0
|
||||||
var/caliber = null //Which kind of guns it can be loaded into
|
var/caliber = null //Which kind of guns it can be loaded into
|
||||||
var/projectile_type = null //The bullet type to create when New() is called
|
var/projectile_type = null //The bullet type to create when New() is called
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
item_state = "cleaner"
|
item_state = "cleaner"
|
||||||
flags = OPENCONTAINER | NOBLUDGEON
|
flags = OPENCONTAINER | NOBLUDGEON
|
||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
throwforce = 3
|
throwforce = 0
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
throw_speed = 2
|
throw_speed = 2
|
||||||
throw_range = 10
|
throw_range = 10
|
||||||
@@ -147,7 +147,7 @@
|
|||||||
icon = 'icons/obj/gun.dmi'
|
icon = 'icons/obj/gun.dmi'
|
||||||
icon_state = "chemsprayer"
|
icon_state = "chemsprayer"
|
||||||
item_state = "chemsprayer"
|
item_state = "chemsprayer"
|
||||||
throwforce = 3
|
throwforce = 0
|
||||||
w_class = 3.0
|
w_class = 3.0
|
||||||
volume = 600
|
volume = 600
|
||||||
origin_tech = "combat=3;materials=3;engineering=3"
|
origin_tech = "combat=3;materials=3;engineering=3"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
item_state = "scrap-metal"
|
item_state = "scrap-metal"
|
||||||
desc = "A piece of scrap"
|
desc = "A piece of scrap"
|
||||||
var/classtext = ""
|
var/classtext = ""
|
||||||
throwforce = 14.0
|
throwforce = 5.0
|
||||||
m_amt = 0
|
m_amt = 0
|
||||||
g_amt = 0
|
g_amt = 0
|
||||||
w_amt = 0
|
w_amt = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user