game folder

This commit is contained in:
Poojawa
2017-02-08 00:02:05 -06:00
parent f6dfa820fd
commit 01ed369034
26 changed files with 504 additions and 164 deletions
+11 -9
View File
@@ -427,11 +427,12 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
switch(src.state)
if(STATE_DEFAULT)
if (src.authenticated)
if(SSshuttle.emergencyLastCallLoc)
dat += "<BR>Most recent shuttle call/recall traced to: <b>[format_text(SSshuttle.emergencyLastCallLoc.name)]</b>"
else
dat += "<BR>Unable to trace most recent shuttle call/recall signal."
dat += "<BR>Logged in as: [auth_id]"
if(SSshuttle.emergencyCallAmount)
if(SSshuttle.emergencyLastCallLoc)
dat += "Most recent shuttle call/recall traced to: <b>[format_text(SSshuttle.emergencyLastCallLoc.name)]</b><BR>"
else
dat += "Unable to trace most recent shuttle call/recall signal.<BR>"
dat += "Logged in as: [auth_id]"
dat += "<BR>"
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=logout'>Log Out</A> \]<BR>"
dat += "<BR><B>General Functions</B>"
@@ -577,10 +578,11 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
var/dat = ""
switch(src.aistate)
if(STATE_DEFAULT)
if(SSshuttle.emergencyLastCallLoc)
dat += "<BR>Latest emergency signal trace attempt successful.<BR>Last signal origin: <b>[format_text(SSshuttle.emergencyLastCallLoc.name)]</b>.<BR>"
else
dat += "<BR>Latest emergency signal trace attempt failed.<BR>"
if(SSshuttle.emergencyCallAmount)
if(SSshuttle.emergencyLastCallLoc)
dat += "Latest emergency signal trace attempt successful.<BR>Last signal origin: <b>[format_text(SSshuttle.emergencyLastCallLoc.name)]</b>.<BR>"
else
dat += "Latest emergency signal trace attempt failed.<BR>"
if(authenticated)
dat += "Current login: [auth_id]"
else
+35 -2
View File
@@ -16,6 +16,7 @@
density = 0
obj_integrity = 300
max_integrity = 300
resistance_flags = FIRE_PROOF
heat_proof = 1
glass = 1
var/nextstate = null
@@ -25,8 +26,32 @@
closingLayer = CLOSED_FIREDOOR_LAYER
assemblytype = /obj/structure/firelock_frame
armor = list(melee = 30, bullet = 30, laser = 20, energy = 20, bomb = 10, bio = 100, rad = 100, fire = 95, acid = 70)
CanAtmosPass = ATMOS_PASS_PROC
var/boltslocked = TRUE
var/list/affecting_areas
/obj/machinery/door/firedoor/Initialize()
..()
CalculateAffectingAreas()
/obj/machinery/door/firedoor/proc/CalculateAffectingAreas()
remove_from_areas()
affecting_areas = get_adjacent_open_areas(src) | get_area(src)
for(var/I in affecting_areas)
var/area/A = I
LAZYADD(A.firedoors, src)
//see also turf/AfterChange for adjacency shennanigans
/obj/machinery/door/firedoor/proc/remove_from_areas()
if(affecting_areas)
for(var/I in affecting_areas)
var/area/A = I
LAZYREMOVE(A.firedoors, src)
/obj/machinery/door/firedoor/Destroy()
remove_from_areas()
affecting_areas.Cut()
return ..()
/obj/machinery/door/firedoor/Bumped(atom/AM)
if(panel_open || operating)
@@ -44,12 +69,19 @@
stat |= NOPOWER
return
/obj/machinery/door/firedoor/attack_hand(mob/user)
if(operating || !density)
return
user.visible_message("[user] bangs on \the [src].",
"You bang on \the [src].")
playsound(loc, 'sound/effects/Glassknock.ogg', 10, FALSE, frequency = 32000)
/obj/machinery/door/firedoor/attackby(obj/item/weapon/C, mob/user, params)
add_fingerprint(user)
if(operating)
return
if(welded)
if(istype(C, /obj/item/weapon/wrench))
if(boltslocked)
@@ -160,6 +192,7 @@
/obj/machinery/door/firedoor/border_only
icon = 'icons/obj/doors/edge_Doorfire.dmi'
flags = ON_BORDER
CanAtmosPass = ATMOS_PASS_PROC
/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0)
if(istype(mover) && mover.checkpass(PASSGLASS))
+1 -3
View File
@@ -433,9 +433,7 @@ Class Procs:
user << "<span class='warning'>It's on fire!</span>"
var/healthpercent = (obj_integrity/max_integrity) * 100
switch(healthpercent)
if(100 to INFINITY)
user << "It seems pristine and undamaged."
if(50 to 100)
if(50 to 99)
user << "It looks slightly damaged."
if(25 to 50)
user << "It appears heavily damaged."