Merge pull request #3346 from Iamgoofball/FUCKMONKEY

Removes a bunch of ticker.mode.name == "monkey" checks, since monkey doesn't even exist anymore
This commit is contained in:
Razharas
2014-04-07 18:30:30 -07:00
6 changed files with 7 additions and 15 deletions
-4
View File
@@ -231,8 +231,6 @@ Auto Patrol: []"},
continue
if (istype(C, /mob/living/carbon/human))
threatlevel = src.assess_perp(C)
else if ((istype(C, /mob/living/carbon/monkey)) && (C.client) && (ticker.mode.name == "monkey"))
threatlevel = 4
//src.speak(C.real_name + text(": threat: []", threatlevel))
if (threatlevel < 4 )
continue
@@ -638,8 +636,6 @@ Auto Patrol: []"},
if (istype(C, /mob/living/carbon/human))
src.threatlevel = src.assess_perp(C)
else if ((istype(C, /mob/living/carbon/monkey)) && (C.client) && (ticker.mode.name == "monkey"))
src.threatlevel = 4
if (!src.threatlevel)
continue
+1 -3
View File
@@ -14,9 +14,7 @@
return src.attack_hand(user)
/obj/machinery/igniter/attack_paw(mob/user as mob)
if ((ticker && ticker.mode.name == "monkey"))
return src.attack_hand(user)
return
return src.attack_hand(user)
/obj/machinery/igniter/attack_hand(mob/user as mob)
if(..())
+2 -2
View File
@@ -204,7 +204,7 @@ Class Procs:
return 1
if(usr.restrained() || usr.lying || usr.stat)
return 1
if(!(ishuman(usr) || issilicon(usr) || (ismonkey(usr) && ticker && ticker.mode.name == "monkey")))
if(!(ishuman(usr) || issilicon(usr)))
usr << "<span class='notice'>You don't have the dexterity to do this!</span>"
return 1
@@ -245,7 +245,7 @@ Class Procs:
return 1
if ( ! (istype(usr, /mob/living/carbon/human) || \
istype(usr, /mob/living/silicon) || \
istype(usr, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
istype(usr, /mob/living/carbon/monkey)) )
usr << "<span class='danger'>You don't have the dexterity to do this!</span>"
return 1
/*
+1 -1
View File
@@ -27,7 +27,7 @@
if ( ! (istype(user, /mob/living/carbon/human) || \
istype(user, /mob/living/silicon) || \
istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
istype(user, /mob/living/carbon/monkey)) )
user << "\red You don't have the dexterity to do this!"
return 1
@@ -370,7 +370,5 @@
/mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools
if(!ticker) return 0
if(!ticker.mode.name == "monkey") return 0
return 1
return 0
+2 -2
View File
@@ -353,7 +353,7 @@
update_overlay |= APC_UPOVERLAY_ENVIRON1
else if(environ==2)
update_overlay |= APC_UPOVERLAY_ENVIRON2
var/results = 0
if(last_update_state == update_state && last_update_overlay == update_overlay)
@@ -773,7 +773,7 @@
return 0
if ( ! (istype(user, /mob/living/carbon/human) || \
istype(user, /mob/living/silicon) || \
istype(user, /mob/living/carbon/monkey) /*&& ticker && ticker.mode.name == "monkey"*/) )
istype(user, /mob/living/carbon/monkey)) )
user << "\red You don't have the dexterity to use this [src]!"
return 0
if(user.restrained())