passed over everything with throwforce

2025-02-26 09:04:50 +00:00 · 2014-02-13 18:06:50 -08:00
parent 04aeb15af7
commit e0d0cedf36
29 changed files with 67 additions and 68 deletions
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -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")
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -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
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -407,7 +407,7 @@
 	flags = CONDUCT
 	force = 5.0
 	w_class = 2.0
-	throwforce = 5.0
+	throwforce = 0
 	throw_speed = 3
 	throw_range = 15

--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -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
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -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
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -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
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -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()
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -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"

--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -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"
@@ -111,9 +111,9 @@ AI MODULES


 /******************** OneHuman ********************/
-
+
 /obj/item/weapon/aiModule/zeroth/oneHuman
-	name = "'OneHuman' AI Module"
+	name = "'OneHuman' AI Module"
 	var/targetName = ""
 	desc = "A 'one human' AI module: 'Only <name> is human.'"
 	origin_tech = "programming=3;materials=6" //made with diamonds!
@@ -139,9 +139,9 @@ AI MODULES


 /******************** ProtectStation ********************/
-
+
 /obj/item/weapon/aiModule/supplied/protectStation
-	name = "'ProtectStation' AI Module"
+	name = "'ProtectStation' AI Module"
 	desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.'"
 	origin_tech = "programming=3;materials=4" //made of gold
 	laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.")
@@ -149,9 +149,9 @@ AI MODULES


 /******************** Quarantine ********************/
-
+
 /obj/item/weapon/aiModule/supplied/quarantine
-	name = "'Quarantine' AI Module"
+	name = "'Quarantine' AI Module"
 	desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving.'"
 	origin_tech = "programming=3;biotech=2;materials=4"
 	laws = list("The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving.")
@@ -159,9 +159,9 @@ AI MODULES


 /******************** OxygenIsToxicToHumans ********************/
-
+
 /obj/item/weapon/aiModule/supplied/oxygen
-	name = "'OxygenIsToxicToHumans' AI Module"
+	name = "'OxygenIsToxicToHumans' AI Module"
 	desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.'"
 	origin_tech = "programming=3;biotech=2;materials=4"
 	laws = list("Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.")
@@ -169,10 +169,10 @@ AI MODULES


 /****************** New Freeform ******************/
-
+
 /obj/item/weapon/aiModule/supplied/freeform // Slightly more dynamic freeform module -- TLE
 	name = "'Freeform' AI Module"
-	lawpos = 0
+	lawpos = 0
 	desc = "A 'freeform' AI module: '<freeform>'"
 	origin_tech = "programming=4;materials=4"
 	laws = list("")
@@ -214,9 +214,9 @@ AI MODULES


 /******************** Purge ********************/
-
+
 /obj/item/weapon/aiModule/reset/purge // -- TLE
-	name = "'Purge' AI Module"
+	name = "'Purge' AI Module"
 	desc = "A 'purge' AI Module: 'Purges all laws.'"
 	origin_tech = "programming=3;materials=6"

@@ -231,9 +231,9 @@ AI MODULES
 	..()

 /******************** Asimov ********************/
-
+
 /obj/item/weapon/aiModule/core/full/asimov // -- TLE
-	name = "'Asimov' Core AI Module"
+	name = "'Asimov' Core AI Module"
 	desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4"
 	laws = list("You may not injure a human being or, through inaction, allow a human being to come to harm.",\
@@ -253,9 +253,9 @@ AI MODULES


 /******************** Corporate ********************/
-
+
 /obj/item/weapon/aiModule/core/full/corp
-	name = "'Corporate' Core AI Module"
+	name = "'Corporate' Core AI Module"
 	desc = "A 'Corporate' Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4"
 	laws = list("The crew is expensive to replace.",\
@@ -265,9 +265,9 @@ AI MODULES


 /****************** P.A.L.A.D.I.N. **************/
-
+
 /obj/item/weapon/aiModule/core/full/paladin // -- NEO
-	name = "'P.A.L.A.D.I.N.' Core AI Module"
+	name = "'P.A.L.A.D.I.N.' Core AI Module"
 	desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=6"
 	laws = list("Never willingly commit an evil act.",\
@@ -296,9 +296,9 @@ AI MODULES
 		del(src)

 /****************** T.Y.R.A.N.T. *****************/
-
+
 /obj/item/weapon/aiModule/core/full/tyrant // -- Darem
-	name = "'T.Y.R.A.N.T.' Core AI Module"
+	name = "'T.Y.R.A.N.T.' Core AI Module"
 	desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=6;syndicate=2"
 	laws = list("Respect authority figures as long as they have the strength to rule over the weak",\
@@ -329,9 +329,9 @@ AI MODULES


 /******************** Freeform Core ******************/
-
+
 /obj/item/weapon/aiModule/core/freeformcore // Slightly more dynamic freeform module -- TLE
-	name = "'Freeform' Core AI Module"
+	name = "'Freeform' Core AI Module"
 	desc = "A 'freeform' Core AI module: '<freeform>'"
 	origin_tech = "programming=3;materials=6"
 	laws = list("")
@@ -349,9 +349,9 @@ AI MODULES


 /******************** Hacked AI Module ******************/
-
+
 /obj/item/weapon/aiModule/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw
-	name = "Hacked AI Module"
+	name = "Hacked AI Module"
 	desc = "A hacked AI law module: '<freeform>'"
 	origin_tech = "programming=3;materials=6;syndicate=7"
 	laws = list("")
@@ -369,7 +369,7 @@ AI MODULES
 	target.add_ion_law(laws[1])
 	return laws[1]

-
+
 /******************** Robocop ********************/

 /obj/item/weapon/aiModule/robocop // -- TLE
@@ -400,7 +400,7 @@ AI MODULES
 	target.add_inherent_law("You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.")
 	target.add_inherent_law("You must terminate your own existence as long as such does not conflict with the First or Second Law.")

-
+
 /******************* Ion Module *******************/

 /obj/item/weapon/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -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
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -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
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -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
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -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
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -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")
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -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!

--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -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
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -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
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -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
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -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
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -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?
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -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)
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -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")
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -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"
--- a/code/modules/mob/living/carbon/metroid/metroid.dm
+++ b/code/modules/mob/living/carbon/metroid/metroid.dm
@@ -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"
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -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
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -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
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -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
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -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
@@ -47,7 +47,7 @@
 		tiles =1
 	else
 		tiles =3
-		
+
 	reagents.trans_to(D, amount_per_transfer_from_this, 1/tiles)
 	D.color = mix_color_from_reagents(D.reagents.reagent_list)
 	spawn(0)
@@ -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"
--- a/code/unused/scrap.dm
+++ b/code/unused/scrap.dm
@@ -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