cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-19 23:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes too many items in the conscription kit #12436

Browse Source
This commit is contained in:
variableundefined
2019-09-29 19:41:07 -07:00
committed by GitHub
parent b119815a58 8b87bd529c
commit e02a76aa73
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/supplypacks.dm
View File

@@ -1422,7 +1422,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
name = "Shaft Miner Starter Kit" name = "Shaft Miner Starter Kit"
cost = 30 cost = 30
access = access_qm access = access_qm
contains = list(/obj/item/storage/backpack/duffel/mining_conscript/noid) contains = list(/obj/item/storage/backpack/duffel/mining_conscript)
containertype = /obj/structure/closet/crate/secure containertype = /obj/structure/closet/crate/secure
containername = "shaft miner starter kit" containername = "shaft miner starter kit"

6
code/game/objects/items/weapons/storage/backpack.dm
View File

@@ -359,11 +359,11 @@
new /obj/item/ammo_box/magazine/m12g/buckshot(src) new /obj/item/ammo_box/magazine/m12g/buckshot(src)
new /obj/item/ammo_box/magazine/m12g/dragon(src) new /obj/item/ammo_box/magazine/m12g/dragon(src)
/obj/item/storage/backpack/duffel/mining_conscript/noid /obj/item/storage/backpack/duffel/mining_conscript/
name = "mining conscription kit" name = "mining conscription kit"
desc = "A kit containing everything a crewmember needs to support a shaft miner in the field." desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
/obj/item/storage/backpack/duffel/mining_conscript/noid/New() /obj/item/storage/backpack/duffel/mining_conscript/New()
..() ..()
new /obj/item/pickaxe(src) new /obj/item/pickaxe(src)
new /obj/item/clothing/glasses/meson(src) new /obj/item/clothing/glasses/meson(src)
@@ -371,7 +371,7 @@
new /obj/item/storage/bag/ore(src) new /obj/item/storage/bag/ore(src)
new /obj/item/clothing/under/rank/miner/lavaland(src) new /obj/item/clothing/under/rank/miner/lavaland(src)
new /obj/item/encryptionkey/headset_cargo(src) new /obj/item/encryptionkey/headset_cargo(src)
new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/mask/gas/explorer(src)
/obj/item/storage/backpack/duffel/syndie/ammo/smg /obj/item/storage/backpack/duffel/syndie/ammo/smg

13
code/modules/mining/machine_vending.dm
View File

@@ -36,7 +36,7 @@
new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000), new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000), new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000),
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000), new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000),
new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffel/mining_conscript, 1500), new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffel/mining_conscript/full, 1500),
new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000), new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000),
new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000),
new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000),
@@ -235,7 +235,7 @@
new /obj/item/extinguisher/mini(drop_location) new /obj/item/extinguisher/mini(drop_location)
new /obj/item/twohanded/kinetic_crusher(drop_location) new /obj/item/twohanded/kinetic_crusher(drop_location)
if("Mining Conscription Kit") if("Mining Conscription Kit")
new /obj/item/storage/backpack/duffel/mining_conscript(drop_location) new /obj/item/storage/backpack/duffel/mining_conscript/full(drop_location)
qdel(voucher) qdel(voucher)
@@ -293,18 +293,13 @@
to_chat(user, "You upgrade [I] with mining access.") to_chat(user, "You upgrade [I] with mining access.")
qdel(src) qdel(src)
/obj/item/storage/backpack/duffel/mining_conscript /obj/item/storage/backpack/duffel/mining_conscript/full
name = "mining conscription kit" name = "mining conscription kit"
desc = "A kit containing everything a crewmember needs to support a shaft miner in the field." desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
/obj/item/storage/backpack/duffel/mining_conscript/New() /obj/item/storage/backpack/duffel/mining_conscript/full/New()
..() ..()
new /obj/item/clothing/glasses/meson(src)
new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
new /obj/item/storage/bag/ore(src)
new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/clothing/suit/hooded/explorer(src)
new /obj/item/encryptionkey/headset_cargo(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/card/id/mining_access_card(src) new /obj/item/card/id/mining_access_card(src)
new /obj/item/gun/energy/kinetic_accelerator(src) new /obj/item/gun/energy/kinetic_accelerator(src)
new /obj/item/kitchen/knife/combat/survival(src) new /obj/item/kitchen/knife/combat/survival(src)