From 5181326d5445e2a9542c0d26685f504908e4aa06 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Fri, 30 Jun 2017 23:17:26 -0500
Subject: [PATCH] [MIRROR] Adds some custom force strings and fixes a bug
 (#1700)

* Adds some custom force strings and fixes a bug

* Delete clown_items.dm.rej
---
 code/game/objects/items.dm                           | 5 ++++-
 code/game/objects/items/weapons/clown_items.dm       | 1 +
 code/game/objects/items/weapons/melee/misc.dm        | 1 +
 code/game/objects/items/weapons/mop.dm               | 1 +
 code/game/objects/items/weapons/singularityhammer.dm | 1 +
 code/game/objects/items/weapons/storage/book.dm      | 1 +
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index ef54ea282e..ecd8350be2 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -670,7 +670,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 /obj/item/proc/openTip(location, control, params, user)
 	if(last_force_string_check != force && !force_string_override)
 		set_force_string()
-	openToolTip(user,src,params,title = name,content = "[desc]<br>[force ? "<b>Force:</b> [force_string]" : ""]",theme = "")
+	if(!force_string_override)
+		openToolTip(user,src,params,title = name,content = "[desc]<br>[force ? "<b>Force:</b> [force_string]" : ""]",theme = "")
+	else
+		openToolTip(user,src,params,title = name,content = "[desc]<br><b>Force:</b> [force_string]",theme = "")
 
 /obj/item/MouseEntered(location, control, params)
 	if(in_inventory && usr.client.prefs.enable_tips)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 8c8b476113..e7fb3e0f64 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -21,6 +21,7 @@
 	throw_speed = 3
 	throw_range = 7
 	var/cleanspeed = 50 //slower than mop
+	force_string = "robust... against germs"
 
 /obj/item/weapon/soap/nanotrasen
 	desc = "A Nanotrasen brand bar of soap. Smells of plasma."
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index 8cf7d67336..7305f54d11 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -185,6 +185,7 @@
 	var/obj/machinery/power/supermatter_shard/shard
 	var/balanced = 1
 	origin_tech = "combat=7;materials=6"
+	force_string = "INFINITE"
 
 /obj/item/weapon/melee/supermatter_sword/New()
 	..()
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 50b3ed20f7..9bf5be6e35 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -14,6 +14,7 @@
 	var/mopcount = 0
 	var/mopcap = 5
 	var/mopspeed = 30
+	force_string = "robust... against germs"
 
 /obj/item/weapon/mop/New()
 	..()
diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm
index cd7da94a08..c66e42c582 100644
--- a/code/game/objects/items/weapons/singularityhammer.dm
+++ b/code/game/objects/items/weapons/singularityhammer.dm
@@ -14,6 +14,7 @@
 	origin_tech = "combat=4;bluespace=4;plasmatech=7"
 	armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 50, bio = 0, rad = 0, fire = 100, acid = 100)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+	force_string = "LORD SINGULOTH HIMSELF"
 
 /obj/item/weapon/twohanded/singularityhammer/New()
 	..()
diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm
index 3b655550b4..2e9bec23bf 100644
--- a/code/game/objects/items/weapons/storage/book.dm
+++ b/code/game/objects/items/weapons/storage/book.dm
@@ -25,6 +25,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 	item_state = "bible"
 	var/mob/affecting = null
 	var/deity_name = "Christ"
+	force_string = "holy"
 
 /obj/item/weapon/storage/book/bible/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is offering [user.p_them()]self to [deity_name]! It looks like [user.p_theyre()] trying to commit suicide!</span>")