From 4ceb335a5ed762fa68de5d986234f2456ffd7157 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Fri, 15 May 2015 15:36:39 -0400 Subject: [PATCH] Snowflake fun removal --- code/game/objects/items/weapons/tools.dm | 33 ++++--------------- .../mob/living/carbon/human/human_movement.dm | 24 +------------- 2 files changed, 8 insertions(+), 49 deletions(-) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index a11b531b230..6cb621d8cce 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -119,32 +119,13 @@ /obj/item/weapon/wirecutters/attack(mob/living/carbon/human/C as mob, mob/user as mob) if(C.handcuffed) - if(C.species.name == "Wryn" && (locate(C.internal_organs_by_name["antennae"]) in C.internal_organs)) - - var/turf/p_loc = user.loc - var/turf/p_loc_m = C.loc - - user.visible_message("\blue [user] begins to cut off [C]'s antennae.") - C << "\red [user] begins to cut off your antennae!" - do_after(C, 150) - if(p_loc == user.loc && p_loc_m == C.loc) - var/obj/item/organ/wryn/hivenode/H = C.internal_organs_by_name["antennae"] - H.removed(user) - C.remove_language("Wryn Hivemind") - new /obj/item/organ/wryn/hivenode(user.loc) - user << " You hear a loud crunch as you mercilessly off cut [C]'s antennae." - C << "You hear a loud crunch as the wirecutters rip through your antennae." - C << "Its so quiet..." - C.h_style = "Bald" - C.update_hair() - else - if(istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable)) - usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\ - "You cut \the [C]'s restraints with \the [src]!",\ - "You hear cable being cut.") - C.handcuffed = null - C.update_inv_handcuffed() - return + if(istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable)) + usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\ + "You cut \the [C]'s restraints with \the [src]!",\ + "You hear cable being cut.") + C.handcuffed = null + C.update_inv_handcuffed() + return else ..() diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 09ba17866ee..b7f1bea99a8 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -6,29 +6,7 @@ tally -= 2 if(species.slowdown) - if(src.species.name == "Wryn") //handles Wryn specific movement - if(!istype(get_turf(src), /turf/space)) //Space is 20c whut.. - var/loc_temp = T0C - var/datum/gas_mixture/environment = loc.return_air() - if(istype(src.loc, /obj/mecha)) - var/obj/mecha/M = src.loc - loc_temp = M.return_temperature() - else - loc_temp = environment.temperature - - switch(loc_temp) //messy switch statement to assign the proper speed - if(0 to 213.15) tally = -6 //you deserve this, god speed to you - if(213.15 to 250.15) tally = -5 //must get colder.. - if(260.15 to 273.15) tally = -4 - if(273.15 to 283.15) tally = -3 //pretty fast, though will likely never happen - if(283.15 to 300.15) tally = 2 //slower than humans at normal room temperatures - if(300.15 to 310.15) tally = 5 - if(317.15 to 400) tally = 8 - else tally = 12 //Stop running into fire you stupid bug - else - tally = -7 - else - tally = species.slowdown + tally = species.slowdown if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything