April sync (#360)
* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
This commit is contained in:
@@ -52,7 +52,6 @@
|
||||
new /datum/data/mining_equipment("Drone AI Upgrade", /obj/item/slimepotion/sentience/mining, 1000),
|
||||
new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
|
||||
new /datum/data/mining_equipment("Survival Knife", /obj/item/weapon/kitchen/knife/combat/survival, 350),
|
||||
new /datum/data/mining_equipment("Survival Pen Economy Pack",/obj/item/weapon/storage/box/medipens/survival, 2000),
|
||||
new /datum/data/mining_equipment("Stimpack", /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack, 250),
|
||||
new /datum/data/mining_equipment("Stimpack Economy Pack",/obj/item/weapon/storage/box/medipens/utility, 1000)
|
||||
)
|
||||
@@ -276,10 +275,10 @@
|
||||
/obj/item/weapon/card/mining_access_card/afterattack(atom/movable/AM, mob/user, proximity)
|
||||
if(istype(AM, /obj/item/weapon/card/id) && proximity)
|
||||
var/obj/item/weapon/card/id/I = AM
|
||||
I.access |= access_mining
|
||||
I.access |= access_mining_station
|
||||
I.access |= access_mineral_storeroom
|
||||
I.access |= access_cargo
|
||||
I.access |= GLOB.access_mining
|
||||
I.access |= GLOB.access_mining_station
|
||||
I.access |= GLOB.access_mineral_storeroom
|
||||
I.access |= GLOB.access_cargo
|
||||
to_chat(user, "You upgrade [I] with mining access.")
|
||||
qdel(src)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user