Ports 6440 early

Also moves some new security crate datums to its proper place
This commit is contained in:
Unknown
2019-09-03 18:22:32 -04:00
parent 87a627ad96
commit e34091d1ad
3 changed files with 21 additions and 21 deletions

View File

@@ -397,23 +397,3 @@
containertype = /obj/structure/closet/crate/secure containertype = /obj/structure/closet/crate/secure
containername = "Security biohazard gear" containername = "Security biohazard gear"
access = access_security access = access_security
/datum/supply_pack/security/trackingimplant
name = "Implants - Tracking"
contains = list(
/obj/item/weapon/storage/box/trackimp = 1
)
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "Tracking implants"
access = access_security
/datum/supply_pack/security/chemicalimplant
name = "Implants - Chemical"
contains = list(
/obj/item/weapon/storage/box/chemimp = 1
)
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "Chemical implants"
access = access_security

View File

@@ -34,3 +34,23 @@
/obj/item/weapon/storage/box/gloves /obj/item/weapon/storage/box/gloves
) )
cost = 40 cost = 40
/datum/supply_pack/security/trackingimplant
name = "Implants - Tracking"
contains = list(
/obj/item/weapon/storage/box/trackimp = 1
)
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "Tracking implants"
access = access_security
/datum/supply_pack/security/chemicalimplant
name = "Implants - Chemical"
contains = list(
/obj/item/weapon/storage/box/chemimp = 1
)
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "Chemical implants"
access = access_security

View File

@@ -272,7 +272,7 @@
if(beaker.reagents.total_volume < beaker.reagents.maximum_volume) if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
var/pumped = 0 var/pumped = 0
for(var/datum/reagent/x in occupant.ingested.reagent_list) for(var/datum/reagent/x in occupant.ingested.reagent_list)
occupant.reagents.trans_to_obj(beaker, 3) occupant.ingested.trans_to_obj(beaker, 3)
pumped++ pumped++
if(ishuman(occupant)) if(ishuman(occupant))
occupant.ingested.trans_to_obj(beaker, pumped + 1) occupant.ingested.trans_to_obj(beaker, pumped + 1)