mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Adds shield generators to cargo and explo/mining vendors
This commit is contained in:
@@ -124,6 +124,9 @@
|
|||||||
EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 200),
|
EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 200),
|
||||||
EQUIPMENT("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 125),
|
EQUIPMENT("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 125),
|
||||||
EQUIPMENT("Mining PSG Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 2500),
|
EQUIPMENT("Mining PSG Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 2500),
|
||||||
|
//CHOMPedit Start
|
||||||
|
EQUIPMENT("Mining PSG", /obj/item/device/personal_shield_generator/belt/mining/loaded, 2000),
|
||||||
|
//CHOMPedit End
|
||||||
)
|
)
|
||||||
prize_list["Extra"] = list() // Used in child vendors
|
prize_list["Extra"] = list() // Used in child vendors
|
||||||
//VOREStation Edit End
|
//VOREStation Edit End
|
||||||
|
|||||||
@@ -83,7 +83,7 @@
|
|||||||
EQUIPMENT("Survival Equipment - Exploration Riot shield", /obj/item/weapon/shield/riot/explorer, 75), //CHOMPADD
|
EQUIPMENT("Survival Equipment - Exploration Riot shield", /obj/item/weapon/shield/riot/explorer, 75), //CHOMPADD
|
||||||
EQUIPMENT("Survival Equipment - Storage Pouch", /obj/item/clothing/accessory/storage/pouches/green, 10), //CHOMPADD
|
EQUIPMENT("Survival Equipment - Storage Pouch", /obj/item/clothing/accessory/storage/pouches/green, 10), //CHOMPADD
|
||||||
EQUIPMENT("Survival Equipment - Large Storage Pouch", /obj/item/clothing/accessory/storage/pouches/large/green, 25), //CHOMPADD
|
EQUIPMENT("Survival Equipment - Large Storage Pouch", /obj/item/clothing/accessory/storage/pouches/large/green, 25), //CHOMPADD
|
||||||
EQUIPMENT("Survival Equipment - Pathfinder Belt", /obj/item/weapon/storage/belt/explorer/pathfinder, 200), //CHOMPADD
|
EQUIPMENT("Survival Equipment - Pathfinder Belt", /obj/item/weapon/storage/belt/explorer/pathfinder, 200), //CHOMPADD
|
||||||
)
|
)
|
||||||
prize_list["Consumables"] = list(
|
prize_list["Consumables"] = list(
|
||||||
EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),
|
EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),
|
||||||
@@ -122,6 +122,11 @@
|
|||||||
EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 100),
|
EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 100),
|
||||||
EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 20),
|
EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 20),
|
||||||
EQUIPMENT("UAV - Recon Skimmer", /obj/item/device/uav, 40),
|
EQUIPMENT("UAV - Recon Skimmer", /obj/item/device/uav, 40),
|
||||||
|
//CHOMPedit Start
|
||||||
|
EQUIPMENT("Mining-Grade PSG", /obj/item/device/personal_shield_generator/belt/mining/loaded, 100),
|
||||||
|
EQUIPMENT("Security-Grade PSG", /obj/item/device/personal_shield_generator/belt/security/loaded, 200),
|
||||||
|
EQUIPMENT("PSG Variant-P", /obj/item/device/personal_shield_generator/belt/parry, 250),
|
||||||
|
//CHOMPedit End
|
||||||
)
|
)
|
||||||
//VOREStation Edit End
|
//VOREStation Edit End
|
||||||
|
|
||||||
|
|||||||
@@ -2459,8 +2459,6 @@
|
|||||||
/obj/effect/floor_decal/corner/brown/bordercorner{
|
/obj/effect/floor_decal/corner/brown/bordercorner{
|
||||||
dir = 8
|
dir = 8
|
||||||
},
|
},
|
||||||
/obj/item/device/personal_shield_generator/belt/mining/loaded,
|
|
||||||
/obj/item/device/personal_shield_generator/belt/mining/loaded,
|
|
||||||
/turf/simulated/floor/tiled,
|
/turf/simulated/floor/tiled,
|
||||||
/area/quartermaster/mininglockerroom)
|
/area/quartermaster/mininglockerroom)
|
||||||
"ake" = (
|
"ake" = (
|
||||||
|
|||||||
@@ -3553,7 +3553,6 @@
|
|||||||
/obj/structure/table/steel,
|
/obj/structure/table/steel,
|
||||||
/obj/item/weapon/storage/firstaid/combat,
|
/obj/item/weapon/storage/firstaid/combat,
|
||||||
/obj/item/device/personal_shield_generator/belt/security/loaded,
|
/obj/item/device/personal_shield_generator/belt/security/loaded,
|
||||||
/obj/item/device/personal_shield_generator/belt/security/loaded,
|
|
||||||
/turf/simulated/floor/tiled/dark,
|
/turf/simulated/floor/tiled/dark,
|
||||||
/area/security/tactical)
|
/area/security/tactical)
|
||||||
"ait" = (
|
"ait" = (
|
||||||
@@ -15176,6 +15175,7 @@
|
|||||||
pixel_x = 36;
|
pixel_x = 36;
|
||||||
pixel_y = -6
|
pixel_y = -6
|
||||||
},
|
},
|
||||||
|
/obj/item/device/personal_shield_generator/belt/security/loaded,
|
||||||
/turf/simulated/floor/tiled/dark,
|
/turf/simulated/floor/tiled/dark,
|
||||||
/area/security/warden)
|
/area/security/warden)
|
||||||
"aUB" = (
|
"aUB" = (
|
||||||
|
|||||||
27
modular_chomp/code/datums/supplypacks/security.dm
Normal file
27
modular_chomp/code/datums/supplypacks/security.dm
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
/datum/supply_pack/security/secpsg
|
||||||
|
name = "Security Belt PSGs"
|
||||||
|
contains = list(
|
||||||
|
/obj/item/device/personal_shield_generator/belt/security/loaded,
|
||||||
|
/obj/item/device/personal_shield_generator/belt/security/loaded
|
||||||
|
)
|
||||||
|
cost = 150
|
||||||
|
containertype = /obj/structure/closet/crate/secure/gear
|
||||||
|
containername = "Personal Shield Generators crate"
|
||||||
|
|
||||||
|
/datum/supply_pack/security/secstrongpsg
|
||||||
|
name = "Security Reinforced Backpack PSG"
|
||||||
|
contains = list(
|
||||||
|
/obj/item/device/personal_shield_generator/security/strong/loaded
|
||||||
|
)
|
||||||
|
cost = 200
|
||||||
|
containertype = /obj/structure/closet/crate/secure/gear
|
||||||
|
containername = "Reinforced PSG crate"
|
||||||
|
|
||||||
|
/datum/supply_pack/security/secstrongpsg
|
||||||
|
name = "Security PSG-P"
|
||||||
|
contains = list(
|
||||||
|
/obj/item/device/personal_shield_generator/belt/parry
|
||||||
|
)
|
||||||
|
cost = 250
|
||||||
|
containertype = /obj/structure/closet/crate/secure/gear
|
||||||
|
containername = "PSG-P crate"
|
||||||
@@ -4538,6 +4538,7 @@
|
|||||||
#include "modular_chomp\code\datums\interfaces\appearance.dm"
|
#include "modular_chomp\code\datums\interfaces\appearance.dm"
|
||||||
#include "modular_chomp\code\datums\outfits\jobs\noncrew.dm"
|
#include "modular_chomp\code\datums\outfits\jobs\noncrew.dm"
|
||||||
#include "modular_chomp\code\datums\supplypacks\medical.dm"
|
#include "modular_chomp\code\datums\supplypacks\medical.dm"
|
||||||
|
#include "modular_chomp\code\datums\supplypacks\security.dm"
|
||||||
#include "modular_chomp\code\datums\underwear\socks.dm"
|
#include "modular_chomp\code\datums\underwear\socks.dm"
|
||||||
#include "modular_chomp\code\game\atoms\atoms.dm"
|
#include "modular_chomp\code\game\atoms\atoms.dm"
|
||||||
#include "modular_chomp\code\game\dna\dna2.dm"
|
#include "modular_chomp\code\game\dna\dna2.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user