-Beepsky and other security bots will no longer arrest the detective for his gun if idcheck is set to 1

-Updated cargo crate accesses
-Removed an orphaned pipe in atmos

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5395 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ericgfwong@hotmail.com
2012-12-25 18:53:04 +00:00
parent 3e24586d6b
commit c4bec6677c
4 changed files with 4636 additions and 4631 deletions
+8 -2
View File
@@ -401,18 +401,22 @@
cost = 10
containertype = /obj/structure/closet/crate/secure
containername = "Emitter crate"
access = access_heads
access = access_ce
/datum/supply_packs/engine/field_gen
name = "Field Generator crate"
contains = list(/obj/machinery/field_generator,
/obj/machinery/field_generator)
containertype = /obj/structure/closet/crate/secure
containername = "Field Generator crate"
access = access_ce
/datum/supply_packs/engine/sing_gen
name = "Singularity Generator crate"
contains = list(/obj/machinery/the_singularitygen)
containertype = /obj/structure/closet/crate/secure
containername = "Singularity Generator crate"
access = access_ce
/datum/supply_packs/engine/collector
name = "Collector crate"
@@ -431,7 +435,9 @@
/obj/structure/particle_accelerator/particle_emitter/right,
/obj/structure/particle_accelerator/power_box,
/obj/structure/particle_accelerator/end_cap)
containertype = /obj/structure/closet/crate/secure
containername = "Particle Accelerator crate"
access = access_ce
/datum/supply_packs/mecha_ripley
name = "Circuit Crate (\"Ripley\" APLU)"
@@ -487,7 +493,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/plasma
containername = "Plasma assembly crate"
access = access_tox
access = access_tox_storage
/datum/supply_packs/weapons
name = "Weapons crate"
+1 -1
View File
@@ -7,7 +7,7 @@
density = 1
anchored = 0
// weight = 1.0E7
req_access = list(access_security)
req_one_access = list(access_security, access_forensics_lockers)
health = 100
maxhealth = 100
fire_dam_coeff = 0.7
+1 -1
View File
@@ -11,7 +11,7 @@
fire_dam_coeff = 0.7
brute_dam_coeff = 0.5
// weight = 1.0E7
req_access = list(access_security)
req_one_access = list(access_security, access_forensics_lockers)
var/mob/living/carbon/target
var/oldtarget_name
var/threatlevel = 0
+4626 -4627
View File
File diff suppressed because it is too large Load Diff