shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Adds some custom force strings and fixes a bug (#1700)

Browse Source 
* Adds some custom force strings and fixes a bug

* Delete clown_items.dm.rej
This commit is contained in:
CitadelStationBot
2017-06-30 21:17:26 -07:00
committed by kevinz000
parent 259d773cec
commit 5181326d54
6 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+4 -1
View File
@@ -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)