From 2c48027ce1d12469b4f1908a4415368d26f33c07 Mon Sep 17 00:00:00 2001
From: Duck- <e2204370@drdrb.com>
Date: Wed, 24 Sep 2014 21:11:06 -0400
Subject: [PATCH 1/4] removes dosh from dosh borgs

bye bye, mr dosh.
---
 code/game/objects/items/weapons/RSF.dm | 8 ++++----
 data/investigate/gravity.html          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index ae12e8a6..b966c519 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -12,7 +12,7 @@ RSF
 	density = 0
 	anchored = 0.0
 	var/matter = 0
-	var/mode = 1
+	var/mode = 2
 	flags = TABLEPASS
 	w_class = 3.0
 
@@ -52,12 +52,12 @@ RSF
 		user << "Changed dispensing mode to 'Dice Pack'"
 		return
 	if (mode == 5)
-		mode = 6
+		mode = 1 //6
 		user << "Changed dispensing mode to 'Cigarette'"
 		return
 	if (mode == 6)
-		mode = 1
-		user << "Changed dispensing mode to 'Dosh'"
+		mode = 2
+		user << "Changed dispensing mode to 'Drinking Glass'" //dosh removed by request
 		return
 	// Change mode
 
diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html
index 2f2f7345..50adfb6a 100644
--- a/data/investigate/gravity.html
+++ b/data/investigate/gravity.html
@@ -1,2 +1,2 @@
-<small>13:13 [0x20077c6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>13:13 [0x20077c6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>10:12 [0x20077d7] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>10:12 [0x20077d7] (92,152,1)</small> || the gravitational generator is now charging.<br>

From 04feee7ca25b44acb3b709568477a8378ba73788 Mon Sep 17 00:00:00 2001
From: Duck- <e2204370@drdrb.com>
Date: Thu, 9 Oct 2014 01:23:44 -0400
Subject: [PATCH 2/4] Revert "removes dosh from dosh borgs"

This reverts commit 2c48027ce1d12469b4f1908a4415368d26f33c07.
---
 code/game/objects/items/weapons/RSF.dm | 8 ++++----
 data/investigate/gravity.html          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index b966c519..ae12e8a6 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -12,7 +12,7 @@ RSF
 	density = 0
 	anchored = 0.0
 	var/matter = 0
-	var/mode = 2
+	var/mode = 1
 	flags = TABLEPASS
 	w_class = 3.0
 
@@ -52,12 +52,12 @@ RSF
 		user << "Changed dispensing mode to 'Dice Pack'"
 		return
 	if (mode == 5)
-		mode = 1 //6
+		mode = 6
 		user << "Changed dispensing mode to 'Cigarette'"
 		return
 	if (mode == 6)
-		mode = 2
-		user << "Changed dispensing mode to 'Drinking Glass'" //dosh removed by request
+		mode = 1
+		user << "Changed dispensing mode to 'Dosh'"
 		return
 	// Change mode
 
diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html
index 50adfb6a..2f2f7345 100644
--- a/data/investigate/gravity.html
+++ b/data/investigate/gravity.html
@@ -1,2 +1,2 @@
-<small>10:12 [0x20077d7] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>10:12 [0x20077d7] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>13:13 [0x20077c6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>13:13 [0x20077c6] (92,152,1)</small> || the gravitational generator is now charging.<br>

From aef81d9d1403e62fbc7b4349bb69e7713e715d7b Mon Sep 17 00:00:00 2001
From: Duck- <e2204370@drdrb.com>
Date: Fri, 17 Oct 2014 14:25:37 -0400
Subject: [PATCH 3/4] Various things

Restores glass shard throwdamage to 15 because it should never have been
reduced in the first plaaaace.

Slightly buffs bombsuits-- you'll still die if hit by epicenter, but if
you have a suit, reduces damage taken from heavy explosions.  Was 90+15
+ whatever pressure does to you while you're out to 60 + 1 + whatever
pressure does to you while you're out.  Significantly increases odds of
survival, I think.  Can easily be tweaked further.

Fixes ipcs being affected by cloneloss-- check was placed after damage
was applied so it terminated after damage was applied.
Fixes tasers piercing through godmode.  Now properly calls the proc
instead of applying direct damage like everything else.
Makes pain-immune races immune to halloss.  Because pain damage doesn't
really make sense against things that feel no pain.
Nerfs chloral to stun for ~4 seconds + metabolism duration as opposed to
40 seconds + metabolism duration.  that can go and die.
Painkillers now rapidly remove halloss.  If you have tramadol running in
you, it will take rapid consecutive taser hits to bring you down.  If
you have oxy, it'll most likely take multiple people tasing you
simultaneously to down you.  stun batons and lasers still work just as
well though.
---
 aurora.dme                                         |  2 --
 code/defines/obj/weapon.dm                         |  2 +-
 code/modules/clothing/spacesuits/ninja.dm          |  4 ++--
 code/modules/mob/living/carbon/human/human.dm      |  6 +++---
 .../mob/living/carbon/human/human_damage.dm        | 14 +++++++++-----
 code/modules/mob/living/carbon/shock.dm            |  4 +++-
 code/modules/mob/living/damage_procs.dm            |  2 +-
 code/modules/reagents/Chemistry-Reagents.dm        |  5 ++++-
 data/investigate/gravity.html                      |  4 ++--
 9 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/aurora.dme b/aurora.dme
index b784347e..0084e736 100644
--- a/aurora.dme
+++ b/aurora.dme
@@ -45,8 +45,6 @@
 #define FILE_DIR "icons/Testing"
 #define FILE_DIR "icons/turf"
 #define FILE_DIR "icons/vending_icons"
-#define FILE_DIR "Mocheeze"
-#define FILE_DIR "Mocheeze/Scraps"
 #define FILE_DIR "nano"
 #define FILE_DIR "nano/images"
 #define FILE_DIR "Sammacs Folder"
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index e8a72f1d..a5ed3d19 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -232,7 +232,7 @@
 	desc = "Could probably be used as ... a throwing weapon?"
 	w_class = 2.0
 	force = 5.0
-	throwforce = 8.0
+	throwforce = 15.0
 	item_state = "shard-glass"
 	g_amt = 3750
 	attack_verb = list("stabbed", "slashed", "sliced", "cut")
diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm
index 3d567fa1..ab342e7b 100644
--- a/code/modules/clothing/spacesuits/ninja.dm
+++ b/code/modules/clothing/spacesuits/ninja.dm
@@ -35,8 +35,8 @@
 		//Main function variables.
 	var/s_initialized = 0//Suit starts off.
 	var/s_coold = 0//If the suit is on cooldown. Can be used to attach different cooldowns to abilities. Ticks down every second based on suit ntick().
-	var/s_cost = 5.0//Base energy cost each ntick.
-	var/s_acost = 25.0//Additional cost for additional powers active.
+	var/s_cost = 0.0//Base energy cost each ntick.
+	var/s_acost = 20.0//Additional cost for additional powers active.
 	var/k_cost = 200.0//Kamikaze energy cost each ntick.
 	var/k_damage = 1.0//Brute damage potentially done by Kamikaze each ntick.
 	var/s_delay = 40.0//How fast the suit does certain things, lower is faster. Can be overridden in specific procs. Also determines adverse probability.
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index d043296d..263754b2 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -228,8 +228,8 @@
 			f_loss += 60
 
 			if (prob(getarmor(null, "bomb")))
-				b_loss = b_loss/1.5
-				f_loss = f_loss/1.5
+				b_loss = b_loss/3 //was 1.5
+				f_loss = f_loss/3 //was 1.5
 
 			if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
 				ear_damage += 30
@@ -240,7 +240,7 @@
 		if(3.0)
 			b_loss += 30
 			if (prob(getarmor(null, "bomb")))
-				b_loss = b_loss/2
+				b_loss = b_loss/b_loss //was 2.
 			if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
 				ear_damage += 15
 				ear_deaf += 60
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 28b42db8..790b0388 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -101,11 +101,15 @@
 	if(HULK in mutations)	return
 	..()
 
-/mob/living/carbon/human/adjustCloneLoss(var/amount)
+/mob/living/carbon/human/adjustHalLoss(var/amount)
+	if(species.flags & NO_PAIN) //pain immune
+		return
 	..()
 
+/mob/living/carbon/human/adjustCloneLoss(var/amount)
 	if(species.flags & IS_SYNTHETIC)
 		return
+	..()
 
 	var/heal_prob = max(0, 80 - getCloneLoss())
 	var/mut_prob = min(80, getCloneLoss()+10)
@@ -264,20 +268,20 @@ This function restores all organs.
 /mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null)
 
 	//visible_message("Hit debug. [damage] | [damagetype] | [def_zone] | [blocked] | [sharp] | [used_weapon]")
-	
+
 	//Handle other types of damage
 	if((damagetype != BRUTE) && (damagetype != BURN))
 		if(damagetype == HALLOSS)
 			if ((damage > 25 && prob(20)) || (damage > 50 && prob(60)))
 				emote("scream")
-		
-		
+
+
 		..(damage, damagetype, def_zone, blocked)
 		return 1
 
 	//Handle BRUTE and BURN damage
 	handle_suit_punctures(damagetype, damage)
-	
+
 	if(blocked >= 2)	return 0
 
 	var/datum/organ/external/organ = null
diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm
index 9ea65574..6c1ab3ff 100644
--- a/code/modules/mob/living/carbon/shock.dm
+++ b/code/modules/mob/living/carbon/shock.dm
@@ -5,7 +5,7 @@
 /mob/living/carbon/proc/updateshock()
 	src.traumatic_shock = 			\
 	1	* src.getOxyLoss() + 		\
-	0.7	* src.getToxLoss() + 		\
+	0.5	* src.getToxLoss() + 		\
 	1.5	* src.getFireLoss() + 		\
 	1.2	* src.getBruteLoss() + 		\
 	1.7	* src.getCloneLoss() + 		\
@@ -13,6 +13,8 @@
 
 	if(reagents.has_reagent("alkysine"))
 		src.traumatic_shock -= 10
+	if(reagents.has_reagent("ethanol"))
+		src.traumatic_shock -= 20
 	if(reagents.has_reagent("inaprovaline"))
 		src.traumatic_shock -= 25
 	if(reagents.has_reagent("synaptizine"))
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index f216a74c..cf3fda5a 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -50,7 +50,7 @@
 		if(PARALYZE)
 			Paralyse(effect/(blocked+1))
 		if(AGONY)
-			halloss += effect // Useful for objects that cause "subdual" damage. PAIN!
+			adjustHalLoss(effect) // Useful for objects that cause "subdual" damage. PAIN! //ducknote: tasers did not previously care about armor.  i assume this was deliberate and am leaving it alone since taserdamage is mitigated by siemens
 		if(IRRADIATE)
 			radiation += max((((effect - (effect*(getarmor(null, "rad")/100))))/(blocked+1)),0)//Rads auto check armor
 		if(STUTTER)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index b16656d2..e08ee65f 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -813,6 +813,7 @@ datum
 				if (volume > overdose)
 					M.hallucination = max(M.hallucination, 2)
 				..()
+				M.adjustHalLoss(-5)
 				return
 
 		tramadol
@@ -827,6 +828,7 @@ datum
 				if (volume > overdose)
 					M.hallucination = max(M.hallucination, 2)
 				..()
+				M.adjustHalLoss(-20)
 				return
 
 		oxycodone
@@ -842,6 +844,7 @@ datum
 					M.druggy = max(M.druggy, 10)
 					M.hallucination = max(M.hallucination, 3)
 				..()
+				M.adjustHalLoss(-70)
 				return
 
 
@@ -1973,7 +1976,7 @@ datum
 						M.confused += 2
 						M.drowsyness += 2
 					if(2 to 199)
-						M.Weaken(30)
+						M.Weaken(2)
 					if(200 to INFINITY)
 						M.sleeping += 1
 				..()
diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html
index b372edd0..5ec7d4b2 100644
--- a/data/investigate/gravity.html
+++ b/data/investigate/gravity.html
@@ -1,2 +1,2 @@
-<small>21:23 [0x2009fc1] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>21:23 [0x2009fc1] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>13:12 [0x20077cd] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>13:12 [0x20077cd] (92,152,1)</small> || the gravitational generator is now charging.<br>

From 3e90118b635224fe53869aa98d2f4d0f2f17ae55 Mon Sep 17 00:00:00 2001
From: Duck- <e2204370@drdrb.com>
Date: Sun, 19 Oct 2014 00:20:53 -0400
Subject: [PATCH 4/4] i got GRENADE

i got GRENADE-- grenade timers are now adjustable because someone put
the det time in "quotes" and that broke it.  fixed.
---
 code/game/objects/items/weapons/grenades/grenade.dm | 8 ++++----
 data/investigate/gravity.html                       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 23fe230f..41c4a460 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -90,16 +90,16 @@
 /obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(isscrewdriver(W))
 		switch(det_time)
-			if ("1")
+			if (1)
 				det_time = 10
 				user << "<span class='notice'>You set the [name] for 1 second detonation time.</span>"
-			if ("10")
+			if (10)
 				det_time = 30
 				user << "<span class='notice'>You set the [name] for 3 second detonation time.</span>"
-			if ("30")
+			if (30)
 				det_time = 50
 				user << "<span class='notice'>You set the [name] for 5 second detonation time.</span>"
-			if ("50")
+			if (50)
 				det_time = 1
 				user << "<span class='notice'>You set the [name] for instant detonation.</span>"
 		add_fingerprint(user)
diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html
index 5ec7d4b2..4864ca62 100644
--- a/data/investigate/gravity.html
+++ b/data/investigate/gravity.html
@@ -1,2 +1,2 @@
-<small>13:12 [0x20077cd] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>13:12 [0x20077cd] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>00:14 [0x20077d3] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>00:14 [0x20077d3] (92,152,1)</small> || the gravitational generator is now charging.<br>