Merge pull request #751 from SkyMarshal/Airlocks

Portalathe fix, Magboots + airflow fix, Fix for the "MODE" job, fixed re...
This commit is contained in:
Jim "Apples"
2012-03-25 15:50:37 -07:00
6 changed files with 8 additions and 5 deletions
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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 <del>SKYMARSHAL</del> A CODER"
world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER"
+2
View File
@@ -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
@@ -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()