From ccb08dbc726cf38cd46b8281530f8eece66ef7a2 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Tue, 12 Jul 2011 21:55:21 +0000 Subject: [PATCH] Minor changes: - THE HULK CAN BREAK THESSSEE... CUFFSS... NAAAAAAUURRRRRRRRRGHHHHHHHHHHHHHHHH!!!!!! - Tables are no longer effected by magnitis. Because it's damn stupid. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1840 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 1 + code/game/objects/tables_racks.dm | 4 ++++ code/modules/mob/mob.dm | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index aa97db6910c..60c2a265645 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1406,6 +1406,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov name = "wooden table parts" desc = "Keep away from fire." icon_state = "wood_tableparts" + flags = null /obj/item/weapon/tank name = "tank" diff --git a/code/game/objects/tables_racks.dm b/code/game/objects/tables_racks.dm index eccd9126842..5f3d5605c67 100644 --- a/code/game/objects/tables_racks.dm +++ b/code/game/objects/tables_racks.dm @@ -26,6 +26,10 @@ TABLE AND RACK OBJECT INTERATIONS /obj/table/blob_act() if(prob(75)) + if(istype(src, /obj/table/woodentable)) + new /obj/item/weapon/table_parts/wood( src.loc ) + del(src) + new /obj/item/weapon/table_parts( src.loc ) del(src) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index cea7892ef32..4527f5bc4be 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -935,7 +935,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp if(usr:handcuffed && usr:canmove && (usr.last_special <= world.time)) usr.next_move = world.time + 100 usr.last_special = world.time + 100 - if(isalienadult(usr))//Don't want to do a lot of logic gating here. + if(isalienadult(usr) || usr.mutations & HULK)//Don't want to do a lot of logic gating here. usr << "\green You attempt to break your handcuffs. (This will take around 5 seconds and you need to stand still)" for(var/mob/O in viewers(usr)) O.show_message(text("\red [] is trying to break the handcuffs!", usr), 1)