Fix fix fix

This commit is contained in:
ZomgPonies
2013-11-25 14:02:37 -05:00
parent 533ac36a7b
commit 33880575fe
6 changed files with 11641 additions and 11598 deletions
+33
View File
@@ -121,6 +121,14 @@
opacity = 1
assembly_type = /obj/structure/door_assembly/door_assembly_hatch
/obj/machinery/door/airlock/hatch/delta
name = "Delta Level Hatch"
icon = 'icons/obj/doors/Doorhatchele.dmi'
opacity = 1
hackProof = 1
aiControlDisabled = 1
assembly_type = /obj/structure/door_assembly/door_assembly_hatch
/obj/machinery/door/airlock/maintenance_hatch
name = "Maintenance Hatch"
icon = 'icons/obj/doors/Doorhatchmaint2.dmi'
@@ -1062,3 +1070,28 @@ About the new airlock wires panel:
src.open()
src.locked = 1
return
/obj/machinery/door/airlock/hatch/delta/attackby(C as obj, mob/user as mob)
//world << text("airlock attackby src [] obj [] mob []", src, C, user)
if(!istype(usr, /mob/living/silicon))
if(src.isElectrified())
if(src.shock(user, 75))
return
if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll))
return
src.add_fingerprint(user)
if((istype(C, /obj/item/weapon/weldingtool) && !( src.operating > 0 ) && src.density))
var/obj/item/weapon/weldingtool/W = C
if(W.remove_fuel(0,user))
if(frozen)
frozen = 0
if(!src.welded)
src.welded = 1
else
src.welded = null
src.update_icon()
return
else
return
+1 -1
View File
@@ -321,7 +321,7 @@ proc/trigger_armed_response_team(var/force = 0)
W.name = "[real_name]'s ID Card ([W.assignment])"
W.icon_state = "centcom"
W.access = get_all_accesses()
W.access += get_all_centcom_access()
W.access += list(access_cent_general, access_cent_living, access_cent_storage)
equip_to_slot_or_del(W, slot_wear_id)
return 1