cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

passed over everything with throwforce

Browse Source
This commit is contained in:
hornygranny
2014-02-13 18:06:50 -08:00
parent 04aeb15af7
commit e0d0cedf36
29 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/defines/obj/weapon.dm
View File

@@ -95,7 +95,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "bike_horn"
item_state = "bike_horn"
throwforce = 3
throwforce = 0
hitsound = null //To prevent tap.ogg playing, as the item lacks of force
w_class = 1.0
throw_speed = 3
@@ -112,7 +112,7 @@
desc = "A tube... of cardboard."
icon = 'icons/obj/items.dmi'
icon_state = "c_tube"
throwforce = 1
throwforce = 0
w_class = 1.0
throw_speed = 4
throw_range = 5
@@ -125,7 +125,7 @@
icon_state = "cane"
item_state = "stick"
force = 5.0
throwforce = 7.0
throwforce = 5
w_class = 2.0
m_amt = 50
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")

2
code/game/machinery/bots/cleanbot.dm
View File

@@ -5,7 +5,7 @@
icon = 'icons/obj/aibots.dmi'
icon_state = "bucket_proxy"
force = 3.0
throwforce = 10.0
throwforce = 5.0
throw_speed = 2
throw_range = 5
w_class = 3.0

2
code/game/mecha/mecha_parts.dm
View File

@@ -407,7 +407,7 @@
flags = CONDUCT
force = 5.0
w_class = 2.0
throwforce = 5.0
throwforce = 0
throw_speed = 3
throw_range = 15

2
code/game/objects/items/devices/flash.dm
View File

@@ -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."
icon_state = "flash"
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
throwforce = 5
throwforce = 0
w_class = 1.0
throw_speed = 4
throw_range = 10

2
code/game/objects/items/devices/multitool.dm
View File

@@ -10,7 +10,7 @@
icon_state = "multitool"
force = 5.0
w_class = 2.0
throwforce = 5.0
throwforce = 0
throw_range = 15
throw_speed = 3
m_amt = 50

4
code/game/objects/items/devices/scanners.dm
View File

@@ -169,7 +169,7 @@ MASS SPECTROMETER
w_class = 2.0
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 5
throwforce = 0
throw_speed = 4
throw_range = 20
m_amt = 30
@@ -236,7 +236,7 @@ MASS SPECTROMETER
w_class = 2.0
flags = CONDUCT | OPENCONTAINER
slot_flags = SLOT_BELT
throwforce = 5
throwforce = 0
throw_speed = 4
throw_range = 20
m_amt = 30

4
code/game/objects/items/devices/taperecorder.dm
View File

@@ -8,7 +8,7 @@
m_amt = 60
g_amt = 30
force = 2
throwforce = 2
throwforce = 0
var/recording = 0
var/playing = 0
var/playsleepseconds = 0
@@ -265,7 +265,7 @@
m_amt = 20
g_amt = 5
force = 1
throwforce = 1
throwforce = 0
var/max_capacity = 600
var/used_capacity = 0
var/list/storedinfo = list()

2
code/game/objects/items/stacks/sheets/sheet_types.dm
View File

@@ -49,7 +49,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
singular_name = "metal sheet"
icon_state = "sheet-metal"
m_amt = 3750
throwforce = 14.0
throwforce = 10.0
flags = CONDUCT
origin_tech = "materials=1"

2
code/game/objects/items/weapons/AI_modules.dm
View File

@@ -15,7 +15,7 @@ AI MODULES
flags = CONDUCT
force = 5.0
w_class = 2.0
throwforce = 5.0
throwforce = 0
throw_speed = 3
throw_range = 15
origin_tech = "programming=3"

4
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -302,7 +302,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon = 'icons/obj/clothing/masks.dmi'
icon_state = "cigbutt"
w_class = 1
throwforce = 1
throwforce = 0
/obj/item/weapon/cigbutt/cigarbutt
name = "cigar butt"
@@ -411,7 +411,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/icon_on = "lighter-g-on"
var/icon_off = "lighter-g"
w_class = 1
throwforce = 4
throwforce = 0
flags = CONDUCT
slot_flags = SLOT_BELT
attack_verb = null

2
code/game/objects/items/weapons/handcuffs.dm
View File

@@ -6,7 +6,7 @@
icon_state = "handcuff"
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 5
throwforce = 0
w_class = 2.0
throw_speed = 2
throw_range = 5

5
code/game/objects/items/weapons/kitchen.dm
View File

@@ -19,7 +19,7 @@
/obj/item/weapon/kitchen/utensil
force = 5.0
w_class = 1.0
throwforce = 5.0
throwforce = 0
throw_speed = 3
throw_range = 5
flags = CONDUCT
@@ -154,7 +154,7 @@
desc = "Used to knock out the Bartender."
icon_state = "rolling_pin"
force = 8.0
throwforce = 10.0
throwforce = 5.0
throw_speed = 2
throw_range = 7
w_class = 3.0
@@ -200,7 +200,6 @@
icon = 'icons/obj/food.dmi'
icon_state = "tray"
desc = "A metal tray to lay food on."
throwforce = 12.0
throwforce = 10.0
throw_speed = 1
throw_range = 5

2
code/game/objects/items/weapons/mop.dm
View File

@@ -4,7 +4,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "mop"
force = 3.0
throwforce = 10.0
throwforce = 5.0
throw_speed = 5
throw_range = 10
w_class = 3.0

2
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -150,7 +150,7 @@
icon_state = "cigpacket"
item_state = "cigpacket"
w_class = 1
throwforce = 2
throwforce = 0
slot_flags = SLOT_BELT
storage_slots = 6
can_hold = list("/obj/item/clothing/mask/cigarette")

2
code/game/objects/objs.dm
View File

@@ -7,7 +7,7 @@
var/crit_fail = 0
var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
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/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!

2
code/game/objects/structures/bedsheet_bin.dm
View File

@@ -12,7 +12,7 @@ LINEN BINS
item_state = "bedsheet"
slot_flags = SLOT_BACK
layer = 4.0
throwforce = 1
throwforce 0
throw_speed = 1
throw_range = 2
w_class = 1.0

2
code/modules/clothing/clothing.dm
View File

@@ -10,7 +10,7 @@
/obj/item/clothing/ears
name = "ears"
w_class = 1.0
throwforce = 2
throwforce = 0
slot_flags = SLOT_EARS
/obj/item/clothing/ears/earmuffs

8
code/modules/hydroponics/growninedible.dm
View File

@@ -91,7 +91,7 @@
damtype = "fire"
force = 0
slot_flags = SLOT_HEAD
throwforce = 1
throwforce = 0
w_class = 1.0
throw_speed = 1
throw_range = 3
@@ -106,7 +106,7 @@
damtype = "fire"
force = 0
slot_flags = SLOT_HEAD
throwforce = 1
throwforce = 0
w_class = 1.0
throw_speed = 1
throw_range = 3
@@ -128,7 +128,7 @@
damtype = "fire"
force = 15
hitsound = 'sound/weapons/bladeslice.ogg'
throwforce = 1
throwforce = 5
w_class = 1.0
throw_speed = 1
throw_range = 3
@@ -150,7 +150,7 @@
damtype = "fire"
force = 30
hitsound = 'sound/weapons/bladeslice.ogg'
throwforce = 1
throwforce = 15
w_class = 1.0
throw_speed = 1
throw_range = 3

4
code/modules/hydroponics/hydroitemdefines.dm
View File

@@ -22,7 +22,7 @@
item_state = "spray"
flags = OPENCONTAINER
slot_flags = SLOT_BELT
throwforce = 4
throwforce = 0
w_class = 2.0
throw_speed = 2
throw_range = 10
@@ -41,7 +41,7 @@
item_state = "spray"
flags = OPENCONTAINER
slot_flags = SLOT_BELT
throwforce = 4
throwforce = 0
w_class = 2.0
throw_speed = 2
throw_range = 10

2
code/modules/mining/mine_items.dm
View File

@@ -64,7 +64,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
force = 15.0
throwforce = 4.0
throwforce = 10.0
item_state = "pickaxe"
w_class = 4.0
m_amt = 3750 //one sheet, but where can you make them?

2
code/modules/mining/money_bag.dm
View File

@@ -6,7 +6,7 @@
icon_state = "moneybag"
flags = CONDUCT
force = 10.0
throwforce = 2.0
throwforce = 0
w_class = 4.0
/obj/item/weapon/moneybag/attack_hand(user as mob)

2
code/modules/mining/ores_coins.dm
View File

@@ -118,7 +118,7 @@
icon_state = "coin"
flags = CONDUCT
force = 1
throwforce = 3
throwforce = 0
w_class = 1.0
var/string_attached
var/list/sideslist = list("heads","tails")

2
code/modules/mob/living/carbon/brain/brain_item.dm
View File

@@ -5,7 +5,7 @@
icon_state = "brain"
force = 1.0
w_class = 2.0
throwforce = 1.0
throwforce = 0
throw_speed = 3
throw_range = 5
origin_tech = "biotech=3"

2
code/modules/mob/living/carbon/metroid/metroid.dm
View File

@@ -575,7 +575,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
icon_state = "grey slime extract"
force = 1.0
w_class = 1.0
throwforce = 1.0
throwforce = 0
throw_speed = 3
throw_range = 6
origin_tech = "biotech=4"

2
code/modules/paperwork/paperbin.dm
View File

@@ -3,7 +3,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper_bin1"
item_state = "sheet-metal"
throwforce = 1
throwforce = 0
w_class = 3
throw_speed = 3
throw_range = 7

2
code/modules/power/cable.dm
View File

@@ -202,7 +202,7 @@
amount = MAXCOIL
item_color = "red"
desc = "A coil of power cable."
throwforce = 10
throwforce = 0
w_class = 2.0
throw_speed = 2
throw_range = 5

2
code/modules/projectiles/ammunition.dm
View File

@@ -5,7 +5,7 @@
icon_state = "s-casing"
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 1
throwforce = 0
w_class = 1.0
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

4
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -6,7 +6,7 @@
item_state = "cleaner"
flags = OPENCONTAINER | NOBLUDGEON
slot_flags = SLOT_BELT
throwforce = 3
throwforce = 0
w_class = 2.0
throw_speed = 2
throw_range = 10
@@ -147,7 +147,7 @@
icon = 'icons/obj/gun.dmi'
icon_state = "chemsprayer"
item_state = "chemsprayer"
throwforce = 3
throwforce = 0
w_class = 3.0
volume = 600
origin_tech = "combat=3;materials=3;engineering=3"

2
code/unused/scrap.dm
View File

@@ -10,7 +10,7 @@
item_state = "scrap-metal"
desc = "A piece of scrap"
var/classtext = ""
throwforce = 14.0
throwforce = 5.0
m_amt = 0
g_amt = 0
w_amt = 0