From 879f8c941a6213e9219aa178ab752b27f37c4842 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sun, 25 Mar 2012 15:33:14 -0700 Subject: [PATCH] Portalathe fix, Magboots + airflow fix, Fix for the "MODE" job, fixed removing gravity catapult, fixed death alarms prematurely detonating. --- code/WorkInProgress/SkyMarshal/portalathe.dm | 1 + code/ZAS/Airflow.dm | 2 +- code/game/gamemodes/newobjective.dm | 2 +- code/game/jobs/jobs.dm | 4 ++-- code/game/mecha/equipment/tools/tools.dm | 2 ++ code/game/objects/items/weapons/implants/implant.dm | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/WorkInProgress/SkyMarshal/portalathe.dm b/code/WorkInProgress/SkyMarshal/portalathe.dm index 4dcdb90b2cf..bbd27df919d 100644 --- a/code/WorkInProgress/SkyMarshal/portalathe.dm +++ b/code/WorkInProgress/SkyMarshal/portalathe.dm @@ -14,6 +14,7 @@ var/obj/machinery/light/L = target if(L.status > 1) //Burned or broke L.status = 0 + L.on = 1 L.update() user.visible_message("[user] repairs \the [target] on the spot with their [src]!","You repair the lightbulb!") return \ No newline at end of file diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 486b0bdc6a9..a3cb01eb7ee 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -394,7 +394,7 @@ atom/movable if(src:wear_suit) if(src:wear_suit.flags & SUITSPACE) return if(src:shoes) - if(src:shoes.type == /obj/item/clothing/shoes/magboots) return + if(src:shoes.type == /obj/item/clothing/shoes/magboots && src:shoes.flags & NOSLIP) return src << "\red You are sucked away by airflow!" airflow_speed = min(round(n),9) var diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 730b6f8ea35..0aee8f7006a 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -239,7 +239,7 @@ datum check_completion() if(target && target.current) - if(target.current.stat == 2) + if(target.current.stat == 2 || istype(get_area(target.current), /area/tdome) || issilicon(target.current) || isbrain(target.current)) return 1 else return 0 diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 85933c7b972..951f5e05017 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -128,7 +128,7 @@ var/list/nonhuman_positions = list( return 2 if("Research Director","Chief Medical Officer","Head of Security","Chief Engineer","Warden") return 3 - if("Captain","Head of Personnel","Wizard") + if("Captain","Head of Personnel","Wizard","MODE") return 4 else - world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO SKYMARSHAL A CODER" \ No newline at end of file + world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER" \ No newline at end of file diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 6655dbdd2e5..c0bc4e827a1 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -418,6 +418,8 @@ if(href_list["mode"]) mode = text2num(href_list["mode"]) send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info()) + if(href_list["detach"]) + src.detach() return diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 62191b1390e..1f19f4ca582 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -225,7 +225,7 @@ the implant may become unstable and either pre-maturely inject the subject or si /obj/item/weapon/implant/explosive name = "explosive" desc = "And boom goes the weasel." - var/phrase = "die" + var/phrase = "supercalifragilisticexpialidocious" get_data()