[MIRROR] Clean up all sorts of crap, mostly defines (#5788)

* Clean up all sorts of crap, mostly defines

* fixes compile errors
This commit is contained in:
CitadelStationBot
2018-03-05 13:23:28 -06:00
committed by Poojawa
parent c6aab4b38b
commit 30a4705c01
43 changed files with 168 additions and 346 deletions
+1 -1
View File
@@ -66,7 +66,7 @@
#define ui_monkey_neck "CENTER-3:15,SOUTH:5" //monkey
#define ui_monkey_back "CENTER-2:16,SOUTH:5" //monkey
#define ui_alien_storage_l "CENTER-2:14,SOUTH:5"//alien
//#define ui_alien_storage_l "CENTER-2:14,SOUTH:5"//alien
#define ui_alien_storage_r "CENTER+1:18,SOUTH:5"//alien
#define ui_alien_language_menu "EAST-3:26,SOUTH:5" //alien
+5
View File
@@ -10,6 +10,8 @@
By default, emulate the user's unarmed attack
*/
#define TK_MAXRANGE 15
/atom/proc/attack_tk(mob/user)
if(user.stat || !tkMaxRangeCheck(user, src))
return
@@ -188,3 +190,6 @@
/obj/item/tk_grab/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is using [user.p_their()] telekinesis to choke [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return (OXYLOSS)
#undef TK_MAXRANGE