From 9b3dcb1d5225fae8bb3554581daf3041640ab096 Mon Sep 17 00:00:00 2001 From: Tasald Date: Wed, 20 Apr 2022 20:56:42 -0700 Subject: [PATCH 01/32] Add pathfinder to drop pouches adds pathfinder to drop pouches so they can have them to. --- maps/southern_cross/loadout/loadout_accessories.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index 3febe42b2e..e756cf8656 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -16,19 +16,19 @@ /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" path = /obj/item/clothing/accessory/holster - allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer") \ No newline at end of file + allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Pathfinder","Explorer") From e3477b99b0f49d7286d4ad719c90fda41e7def35 Mon Sep 17 00:00:00 2001 From: Tasald Date: Wed, 20 Apr 2022 20:59:17 -0700 Subject: [PATCH 02/32] Revert "Add pathfinder to drop pouches" --- maps/southern_cross/loadout/loadout_accessories.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index e756cf8656..3febe42b2e 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -16,19 +16,19 @@ /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" path = /obj/item/clothing/accessory/holster - allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Pathfinder","Explorer") + allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer") \ No newline at end of file From b08de848a7ebd31745a376a36102fae415370b0d Mon Sep 17 00:00:00 2001 From: Tasald Date: Wed, 20 Apr 2022 21:00:11 -0700 Subject: [PATCH 03/32] Revert "Revert "Add pathfinder to drop pouches"" --- maps/southern_cross/loadout/loadout_accessories.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index 3febe42b2e..e756cf8656 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -16,19 +16,19 @@ /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" path = /obj/item/clothing/accessory/holster - allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer") \ No newline at end of file + allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Pathfinder","Explorer") From 7443aa5357e24bdfe45f31582c3fe89b38eb1f93 Mon Sep 17 00:00:00 2001 From: Tasald Date: Wed, 20 Apr 2022 21:46:25 -0700 Subject: [PATCH 04/32] Exploration gear update Adds missing standard items to exploration lockers so they arn't gimped. --- maps/southern_cross/structures/closets/misc.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index 7d668945c6..58a0154813 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -45,6 +45,7 @@ /obj/item/clothing/head/helmet/explorer, /obj/item/clothing/suit/storage/hooded/explorer, /obj/item/clothing/mask/gas/explorer, + /obj/item/weapon/storage/belt/explorer, /obj/item/clothing/shoes/boots/winter/explorer, /obj/item/clothing/gloves/black, /obj/item/device/radio/headset/explorer, @@ -53,8 +54,14 @@ /obj/item/weapon/storage/box/flare, /obj/item/device/geiger, /obj/item/weapon/cell/device, - /obj/item/device/radio, + /obj/item/device/radio/headset/explorer, + /obj/item/device/radio/headset/explorer/alt, /obj/item/stack/marker_beacon/thirty, + /obj/item/weapon/material/knife/tacknife/survival, + /obj/item/weapon/material/knife/machete, + /obj/item/clothing/accessory/holster/machete, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood, + /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, /obj/item/device/cataloguer ) From 6139bd4356daef3f0ba1b9d3224063166274c975 Mon Sep 17 00:00:00 2001 From: Tasald Date: Wed, 20 Apr 2022 21:51:05 -0700 Subject: [PATCH 05/32] Update misc.dm --- maps/southern_cross/structures/closets/misc.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index 58a0154813..7881586b10 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -49,6 +49,7 @@ /obj/item/clothing/shoes/boots/winter/explorer, /obj/item/clothing/gloves/black, /obj/item/device/radio/headset/explorer, + /obj/item/device/radio/headset/explorer/alt, /obj/item/device/flashlight, /obj/item/device/gps/explorer, /obj/item/weapon/storage/box/flare, From ecab21f339c63f0e61c3e20199f146d02d55e64c Mon Sep 17 00:00:00 2001 From: Tasald Date: Wed, 20 Apr 2022 22:10:26 -0700 Subject: [PATCH 06/32] PF locker update Adds the plate carrier and exploration bags to pathfinder locker --- .../objects/structures/crates_lockers/closets/misc_vr.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 78827adb08..ba0eb0cb5e 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -99,6 +99,8 @@ starts_with = list( /obj/item/clothing/under/explorer, /obj/item/clothing/suit/storage/hooded/explorer, + /obj/item/clothing/suit/armor/pcarrier/explorer/light, + /obj/item/clothing/head/helmet/explorer, /obj/item/clothing/mask/gas/explorer, /obj/item/weapon/storage/belt/explorer/pathfinder, /obj/item/clothing/shoes/boots/winter/explorer, @@ -125,9 +127,11 @@ /obj/structure/closet/secure_closet/pathfinder/Initialize() if(prob(50)) - starts_with += /obj/item/weapon/storage/backpack + starts_with += /obj/item/weapon/storage/backpack/explorer else - starts_with += /obj/item/weapon/storage/backpack/satchel/norm + starts_with += /obj/item/weapon/storage/backpack/satchel/explorer + if(prob(50)) + starts_with += /obj/item/weapon/storage/backpack/dufflebag/explorer return ..() /* From 41290e05a15a2c2464b31b637c6bd6e41cc7b1d5 Mon Sep 17 00:00:00 2001 From: Tasald Date: Wed, 20 Apr 2022 23:11:52 -0700 Subject: [PATCH 07/32] PF bags Lets the pathfinder spawn with exploration bags instead of generic ones --- code/datums/outfits/outfit_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/datums/outfits/outfit_vr.dm b/code/datums/outfits/outfit_vr.dm index 1883f2b005..9409ce24c1 100644 --- a/code/datums/outfits/outfit_vr.dm +++ b/code/datums/outfits/outfit_vr.dm @@ -166,6 +166,9 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go pda_type = /obj/item/device/pda/pathfinder id_type = /obj/item/weapon/card/id/exploration/head id_pda_assignment = "Pathfinder" + backpack = /obj/item/weapon/storage/backpack/explorer + satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer + messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/assistant/explorer From ae686507c685a6b35968d15c5486540226970d50 Mon Sep 17 00:00:00 2001 From: Tasald Date: Wed, 20 Apr 2022 23:25:30 -0700 Subject: [PATCH 08/32] Binocs Adds binocs to the list of items that can be stored in the belt --- code/game/objects/items/weapons/storage/belt_vr.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index e17a577514..b91c5a1926 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -49,6 +49,7 @@ /obj/item/device/cataloguer, /obj/item/device/radio, /obj/item/device/mapping_unit, + /obj/item/device/binoculars, /obj/item/weapon/kinetic_crusher ) @@ -102,4 +103,4 @@ /obj/item/stack/marker_beacon, /obj/item/stack/flag, /obj/item/weapon/melee - ) \ No newline at end of file + ) From 6660579cd1d8182846c0de10207ac6e2043e86d6 Mon Sep 17 00:00:00 2001 From: Tasald Date: Wed, 20 Apr 2022 23:38:48 -0700 Subject: [PATCH 09/32] Ecig addition Adds the standard and alternative ecigs to the base load out. dun know if setting the price of the alt one two 2 is good or not. --- .../client/preference_setup/loadout/loadout_smoking.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index f9442518b2..33e52f466f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -51,3 +51,12 @@ for(var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand as anything in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat))) cigarettes[initial(cigarette_brand.name)] = cigarette_brand gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes)) + +/datum/gear/ecig + display_name = "ecig" + path = /obj/item/clothing/mask/smokable/ecig/simple + +/datum/gear/util-ecig + display_name = "util-ecig" + cost = 2 + path = /obj/item/clothing/mask/smokable/ecig/util From 1dc543386ffab0106e5dc1b42a9d1496395e46ae Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 00:56:57 -0700 Subject: [PATCH 10/32] removes sharp things takes out the duplicate knife and machete --- maps/southern_cross/structures/closets/misc.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index 7881586b10..9158c4b9a1 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -58,8 +58,6 @@ /obj/item/device/radio/headset/explorer, /obj/item/device/radio/headset/explorer/alt, /obj/item/stack/marker_beacon/thirty, - /obj/item/weapon/material/knife/tacknife/survival, - /obj/item/weapon/material/knife/machete, /obj/item/clothing/accessory/holster/machete, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, From 17a4caca904e63e677fdad22c758a9aecbcf9f5f Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 01:00:36 -0700 Subject: [PATCH 11/32] removes macete holster --- maps/southern_cross/structures/closets/misc.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index 9158c4b9a1..01e094ac30 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -58,7 +58,6 @@ /obj/item/device/radio/headset/explorer, /obj/item/device/radio/headset/explorer/alt, /obj/item/stack/marker_beacon/thirty, - /obj/item/clothing/accessory/holster/machete, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, /obj/item/device/cataloguer From 9438fa9e4c518f9f3ac86c4e45f295f6338c21ab Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 01:04:01 -0700 Subject: [PATCH 12/32] Update outfit_vr.dm --- code/datums/outfits/outfit_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/outfits/outfit_vr.dm b/code/datums/outfits/outfit_vr.dm index 9409ce24c1..57d954adfa 100644 --- a/code/datums/outfits/outfit_vr.dm +++ b/code/datums/outfits/outfit_vr.dm @@ -166,9 +166,9 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go pda_type = /obj/item/device/pda/pathfinder id_type = /obj/item/weapon/card/id/exploration/head id_pda_assignment = "Pathfinder" - backpack = /obj/item/weapon/storage/backpack/explorer - satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer - messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer + backpack = /obj/item/weapon/storage/backpack/explorer //CHOMPADD + satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer //CHOMPADD + messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer //CHOMPADD flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/assistant/explorer From fa60c5f9ace663a4449405b6dd62fb33acd1da04 Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 01:07:47 -0700 Subject: [PATCH 13/32] Update misc.dm --- maps/southern_cross/structures/closets/misc.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index 01e094ac30..8248354f6e 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -45,7 +45,7 @@ /obj/item/clothing/head/helmet/explorer, /obj/item/clothing/suit/storage/hooded/explorer, /obj/item/clothing/mask/gas/explorer, - /obj/item/weapon/storage/belt/explorer, + /obj/item/weapon/storage/belt/explorer, //CHOMPADD /obj/item/clothing/shoes/boots/winter/explorer, /obj/item/clothing/gloves/black, /obj/item/device/radio/headset/explorer, @@ -55,11 +55,9 @@ /obj/item/weapon/storage/box/flare, /obj/item/device/geiger, /obj/item/weapon/cell/device, - /obj/item/device/radio/headset/explorer, - /obj/item/device/radio/headset/explorer/alt, /obj/item/stack/marker_beacon/thirty, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood, //CHOMPADD + /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, //CHOMPADD /obj/item/device/cataloguer ) From 3741dfd3fbd9fb397fb3e2c44e075dd85ee0af7f Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 01:09:47 -0700 Subject: [PATCH 14/32] Update belt_vr.dm --- code/game/objects/items/weapons/storage/belt_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index b91c5a1926..91cf6e1cd4 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -49,7 +49,7 @@ /obj/item/device/cataloguer, /obj/item/device/radio, /obj/item/device/mapping_unit, - /obj/item/device/binoculars, + /obj/item/device/binoculars, //CHOMPADD /obj/item/weapon/kinetic_crusher ) From 029cd66681da2421c391faf055caf62749949b95 Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 01:13:08 -0700 Subject: [PATCH 15/32] Update misc_vr.dm --- .../structures/crates_lockers/closets/misc_vr.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index ba0eb0cb5e..ddf497c508 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -99,8 +99,8 @@ starts_with = list( /obj/item/clothing/under/explorer, /obj/item/clothing/suit/storage/hooded/explorer, - /obj/item/clothing/suit/armor/pcarrier/explorer/light, - /obj/item/clothing/head/helmet/explorer, + /obj/item/clothing/suit/armor/pcarrier/explorer/light, //CHOMPADD + /obj/item/clothing/head/helmet/explorer, //CHOMPADD /obj/item/clothing/mask/gas/explorer, /obj/item/weapon/storage/belt/explorer/pathfinder, /obj/item/clothing/shoes/boots/winter/explorer, @@ -125,13 +125,13 @@ /obj/item/device/cataloguer/compact/pathfinder, /obj/item/device/mapping_unit) -/obj/structure/closet/secure_closet/pathfinder/Initialize() +/obj/structure/closet/secure_closet/pathfinder/Initialize() if(prob(50)) - starts_with += /obj/item/weapon/storage/backpack/explorer + starts_with += /obj/item/weapon/storage/backpack/explorer //CHOMPEDIT else - starts_with += /obj/item/weapon/storage/backpack/satchel/explorer + starts_with += /obj/item/weapon/storage/backpack/satchel/explorer //CHOMPEDIT START if(prob(50)) - starts_with += /obj/item/weapon/storage/backpack/dufflebag/explorer + starts_with += /obj/item/weapon/storage/backpack/dufflebag/explorer //CHOMPEDIT STOP return ..() /* From d8155c9702c6444435684380511cb33772ec3968 Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 01:14:36 -0700 Subject: [PATCH 16/32] Update misc_vr.dm --- code/game/objects/structures/crates_lockers/closets/misc_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index ddf497c508..73becfc093 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -125,7 +125,7 @@ /obj/item/device/cataloguer/compact/pathfinder, /obj/item/device/mapping_unit) -/obj/structure/closet/secure_closet/pathfinder/Initialize() +/obj/structure/closet/secure_closet/pathfinder/Initialize() if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/explorer //CHOMPEDIT else From c7e0e1612afc7db8dd048448dd55d6707f1a2a9f Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 01:15:37 -0700 Subject: [PATCH 17/32] Update loadout_accessories.dm --- maps/southern_cross/loadout/loadout_accessories.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index e756cf8656..f26ff23acd 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -16,19 +16,19 @@ /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") //CHOMPEDIT /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") //CHOMPEDIT /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Pathfinder","Search and Rescue","Explorer","Shaft Miner") //CHOMPEDIT /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" path = /obj/item/clothing/accessory/holster - allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Pathfinder","Explorer") + allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Pathfinder","Explorer") //CHOMPEDIT From 266e1e40184c76cab5a4cb33fab792711229bc10 Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 01:16:45 -0700 Subject: [PATCH 18/32] Update loadout_smoking.dm --- .../client/preference_setup/loadout/loadout_smoking.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 33e52f466f..f9442518b2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -51,12 +51,3 @@ for(var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand as anything in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat))) cigarettes[initial(cigarette_brand.name)] = cigarette_brand gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes)) - -/datum/gear/ecig - display_name = "ecig" - path = /obj/item/clothing/mask/smokable/ecig/simple - -/datum/gear/util-ecig - display_name = "util-ecig" - cost = 2 - path = /obj/item/clothing/mask/smokable/ecig/util From a63a6e6ed2472a394d54ef2c17ba651110e5caa2 Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 21 Apr 2022 01:17:52 -0700 Subject: [PATCH 19/32] Update misc.dm --- maps/southern_cross/structures/closets/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index 8248354f6e..055abdbf7a 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -49,7 +49,7 @@ /obj/item/clothing/shoes/boots/winter/explorer, /obj/item/clothing/gloves/black, /obj/item/device/radio/headset/explorer, - /obj/item/device/radio/headset/explorer/alt, + /obj/item/device/radio/headset/explorer/alt, //CHOMPADD /obj/item/device/flashlight, /obj/item/device/gps/explorer, /obj/item/weapon/storage/box/flare, From 54c90cbc1a8a48981145286349700f0d727b4bc9 Mon Sep 17 00:00:00 2001 From: Tasald Date: Sat, 23 Apr 2022 12:55:26 -0700 Subject: [PATCH 20/32] vendor additions and new armor --- .../ore_redemption_machine/survey_vendor.dm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index b7c170b80f..687bfc9929 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -54,7 +54,9 @@ EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 50), EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100), EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), - EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), + EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 200), //CHOMPEDIT + EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/weapon/gun/energy/locked/frontier, 50), //CHOMPADD + EQUIPMENT("Defense Equipment - Holdout Phaser", obj/item/weapon/gun/energy/locked/frontier/holdout, 75), //CHOMPADD EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/weapon/kinetic_crusher/machete/dagger, 75), EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/weapon/kinetic_crusher/machete, 250), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), @@ -67,12 +69,22 @@ EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 120), EQUIPMENT("Survey Tools - Mapping Unit", /obj/item/device/mapping_unit, 150), EQUIPMENT("Survey Tools - Mapping Beacon", /obj/item/device/holomap_beacon, 25), + EQUIPMENT("Survey Tools - Advanced Cataloguer", /obj/item/device/cataloguer/advanced 300), //CHOMPADD EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75), EQUIPMENT("Survival Equipment - Glowstick", /obj/item/device/flashlight/glowstick, 5), EQUIPMENT("Survival Equipment - Flare", /obj/item/device/flashlight/flare, 5), EQUIPMENT("Survival Equipment - Radioisotope Glowstick", /obj/item/device/flashlight/glowstick/radioisotope, 40), EQUIPMENT("Survival Equipment - Modular Explorer Suit", /obj/item/clothing/suit/armor/pcarrier/explorer, 200), EQUIPMENT("Survival Equipment - Armored Jumpsuit", /obj/item/clothing/under/explorer/armored, 200), + EQUIPMENT("Survival Equipment - Exploration Plate", /obj/item/clothing/accessory/armor/armorplate/explorer 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer 50), //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 - Advanced Plate", /obj/item/clothing/accessory/armor/armorplate/explorer/adv, 400), //CHOMPADD + EQUIPMENT("Survival Equipment - Advanced Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer/adv, 250), //CHOMPADD + EQUIPMENT("Survival Equipment - Advanced Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer/adv, 250), //CHOMPADD + EQUIPMENT("Survival Equipment - Pathfinder Belt", /obj/item/weapon/storage/belt/explorer/pathfinder, 200), //CHOMPADD ) prize_list["Consumables"] = list( EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), @@ -111,7 +123,7 @@ EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 100), EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 20), EQUIPMENT("UAV - Recon Skimmer", /obj/item/device/uav, 40), - + EQUIPMENT("Denecrotizer", /obj/item/device/denecrotizer/medical, 2500), //CHOMPADD ) //VOREStation Edit End From 10276b9e4733f37bc4628b62b53fe018580e1405 Mon Sep 17 00:00:00 2001 From: Tasald Date: Sat, 23 Apr 2022 12:55:51 -0700 Subject: [PATCH 21/32] vendor additions and new armor --- .../clothing/under/accessories/armor.dm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 96d6448fd2..91ff59ae1f 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -97,6 +97,13 @@ icon_state = "armor_light" armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) + /obj/item/clothing/accessory/armor/armorplate/explorer/adv //CHOMPADD + name = "explorer armor plate" //CHOMPADD + desc = "Advanced version of the standared exploration plate. Attaches to a plate carrier." //CHOMPADD + icon_state = "armor_light" //CHOMPADD + armor = list(melee = 45, bullet = 30, laser = 30, energy = 30, bomb = 35, bio = 75, rad = 35) //CHOMPADD +armorsoak = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) //CHOMPADD + /obj/item/clothing/accessory/armor/armorplate/stab name = "mesh armor plate" desc = "A mesh armor plate made of steel-reinforced synthetic fibers, great for dealing with small blades. Attaches to a plate carrier." @@ -214,6 +221,12 @@ icon_state = "armguards_green" armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) +/obj/item/clothing/accessory/armor/armguards/explorer/adv //CHOMPADD + name = "explorer arm guards" //CHOMPADD + desc = "Advanced arm guards for explorers. Attaches to a plate carrier." //CHOMPADD + icon_state = "armguards_green" //CHOMPADD + armor = list(melee = 45, bullet = 30, laser = 30, energy = 30, bomb = 35, bio = 75, rad = 35) //CHOMPADD + /obj/item/clothing/accessory/armor/armguards/merc name = "heavy arm guards" desc = "A pair of red-trimmed black arm pads reinforced with heavy armor plating. Attaches to a plate carrier." @@ -279,6 +292,12 @@ icon_state = "legguards_green" armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) + /obj/item/clothing/accessory/armor/legguards/explorer/adv //CHOMPADD + name = "explorer leg guards" //CHOMPADD + desc = "Advanced leg guards for explorers. Attaches to a plate carrier." //CHOMPADD + icon_state = "legguards_green" //CHOMPADD + armor = list(melee = 45, bullet = 30, laser = 30, energy = 30, bomb = 35, bio = 75, rad = 35) //CHOMPADD + /obj/item/clothing/accessory/armor/legguards/merc name = "heavy leg guards" desc = "A pair of heavily armored leg pads in red-trimmed black. Attaches to a plate carrier." From 2475a1d9c46c50db5d8bdb3753c6cf1e218940d3 Mon Sep 17 00:00:00 2001 From: Tasald Date: Sat, 23 Apr 2022 13:17:47 -0700 Subject: [PATCH 22/32] missed some commas --- code/modules/mining/ore_redemption_machine/survey_vendor.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 687bfc9929..8696340143 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -76,9 +76,9 @@ EQUIPMENT("Survival Equipment - Radioisotope Glowstick", /obj/item/device/flashlight/glowstick/radioisotope, 40), EQUIPMENT("Survival Equipment - Modular Explorer Suit", /obj/item/clothing/suit/armor/pcarrier/explorer, 200), EQUIPMENT("Survival Equipment - Armored Jumpsuit", /obj/item/clothing/under/explorer/armored, 200), - EQUIPMENT("Survival Equipment - Exploration Plate", /obj/item/clothing/accessory/armor/armorplate/explorer 50), //CHOMPADD - EQUIPMENT("Survival Equipment - Exploration Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer 50), //CHOMPADD - EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Plate", /obj/item/clothing/accessory/armor/armorplate/explorer, 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer, 50), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer, 50), //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 - Advanced Plate", /obj/item/clothing/accessory/armor/armorplate/explorer/adv, 400), //CHOMPADD From 1821451f4488a16a6d0483f3254cf4959403d556 Mon Sep 17 00:00:00 2001 From: Tasald Date: Sat, 23 Apr 2022 13:23:17 -0700 Subject: [PATCH 23/32] comma --- code/modules/mining/ore_redemption_machine/survey_vendor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 8696340143..24b4f8674f 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -69,7 +69,7 @@ EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 120), EQUIPMENT("Survey Tools - Mapping Unit", /obj/item/device/mapping_unit, 150), EQUIPMENT("Survey Tools - Mapping Beacon", /obj/item/device/holomap_beacon, 25), - EQUIPMENT("Survey Tools - Advanced Cataloguer", /obj/item/device/cataloguer/advanced 300), //CHOMPADD + EQUIPMENT("Survey Tools - Advanced Cataloguer", /obj/item/device/cataloguer/advanced, 300), //CHOMPADD EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75), EQUIPMENT("Survival Equipment - Glowstick", /obj/item/device/flashlight/glowstick, 5), EQUIPMENT("Survival Equipment - Flare", /obj/item/device/flashlight/flare, 5), From 75f416d104afe0b4bbd5626f5724b200243d0010 Mon Sep 17 00:00:00 2001 From: Tasald Date: Sat, 23 Apr 2022 13:32:43 -0700 Subject: [PATCH 24/32] i am durp added exploration shield and added price to small pouches --- code/modules/mining/ore_redemption_machine/survey_vendor.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 24b4f8674f..9f3af8b026 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -79,7 +79,8 @@ EQUIPMENT("Survival Equipment - Exploration Plate", /obj/item/clothing/accessory/armor/armorplate/explorer, 50), //CHOMPADD EQUIPMENT("Survival Equipment - Exploration Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer, 50), //CHOMPADD EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer, 50), //CHOMPADD - EQUIPMENT("Survival Equipment - Storage Pouch", /obj/item/clothing/accessory/storage/pouches/green, 10), //CHOMPADD + EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/weapon/shield/riot/explorer, 75), //CHOMPADD + EQUIPMENT("Survival Equipment - Storage Pouch", /obj/item/clothing/accessory/storage/pouches/green, 10), //CHOMPADD 10), //CHOMPADD EQUIPMENT("Survival Equipment - Large Storage Pouch", /obj/item/clothing/accessory/storage/pouches/large/green, 25), //CHOMPADD EQUIPMENT("Survival Equipment - Advanced Plate", /obj/item/clothing/accessory/armor/armorplate/explorer/adv, 400), //CHOMPADD EQUIPMENT("Survival Equipment - Advanced Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer/adv, 250), //CHOMPADD From d740295aabb1d008fe91a9c28c235d44b5110f4d Mon Sep 17 00:00:00 2001 From: Tasald Date: Sat, 23 Apr 2022 13:33:43 -0700 Subject: [PATCH 25/32] Update survey_vendor.dm --- code/modules/mining/ore_redemption_machine/survey_vendor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 9f3af8b026..8a659edbf2 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -56,7 +56,7 @@ EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 200), //CHOMPEDIT EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/weapon/gun/energy/locked/frontier, 50), //CHOMPADD - EQUIPMENT("Defense Equipment - Holdout Phaser", obj/item/weapon/gun/energy/locked/frontier/holdout, 75), //CHOMPADD + EQUIPMENT("Defense Equipment - Holdout Phaser", obj/item/weapon/gun/energy/locked/frontier/holdout, 75), //CHOMPADD EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/weapon/kinetic_crusher/machete/dagger, 75), EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/weapon/kinetic_crusher/machete, 250), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), From df53e85e902fcd1855194d8dbde545fcd97195a2 Mon Sep 17 00:00:00 2001 From: Tasald Date: Sat, 23 Apr 2022 13:34:41 -0700 Subject: [PATCH 26/32] Update survey_vendor.dm --- code/modules/mining/ore_redemption_machine/survey_vendor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 8a659edbf2..329af63ad7 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -80,7 +80,7 @@ EQUIPMENT("Survival Equipment - Exploration Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer, 50), //CHOMPADD EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer, 50), //CHOMPADD EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/weapon/shield/riot/explorer, 75), //CHOMPADD - EQUIPMENT("Survival Equipment - Storage Pouch", /obj/item/clothing/accessory/storage/pouches/green, 10), //CHOMPADD 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 - Advanced Plate", /obj/item/clothing/accessory/armor/armorplate/explorer/adv, 400), //CHOMPADD EQUIPMENT("Survival Equipment - Advanced Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer/adv, 250), //CHOMPADD From 014d255168b9642e5bf14ad4d3e664602e91e293 Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 28 Apr 2022 16:33:48 -0700 Subject: [PATCH 27/32] Update code/modules/clothing/under/accessories/armor.dm Co-authored-by: Rykka Stormheart <54187424+Rykka-Stormheart@users.noreply.github.com> --- code/modules/clothing/under/accessories/armor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 91ff59ae1f..0e17cb7e67 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -292,7 +292,7 @@ armorsoak = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = icon_state = "legguards_green" armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) - /obj/item/clothing/accessory/armor/legguards/explorer/adv //CHOMPADD +/obj/item/clothing/accessory/armor/legguards/explorer/adv //CHOMPADD name = "explorer leg guards" //CHOMPADD desc = "Advanced leg guards for explorers. Attaches to a plate carrier." //CHOMPADD icon_state = "legguards_green" //CHOMPADD From 6544a742959224e3e2ae145b152bc62e6a0eea61 Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 28 Apr 2022 16:33:55 -0700 Subject: [PATCH 28/32] Update code/modules/mining/ore_redemption_machine/survey_vendor.dm Co-authored-by: Rykka Stormheart <54187424+Rykka-Stormheart@users.noreply.github.com> --- code/modules/mining/ore_redemption_machine/survey_vendor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 329af63ad7..5a38a40442 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -56,7 +56,7 @@ EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 200), //CHOMPEDIT EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/weapon/gun/energy/locked/frontier, 50), //CHOMPADD - EQUIPMENT("Defense Equipment - Holdout Phaser", obj/item/weapon/gun/energy/locked/frontier/holdout, 75), //CHOMPADD + EQUIPMENT("Defense Equipment - Holdout Phaser", /obj/item/weapon/gun/energy/locked/frontier/holdout, 75), //CHOMPADD EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/weapon/kinetic_crusher/machete/dagger, 75), EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/weapon/kinetic_crusher/machete, 250), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), From a2d407322c887da8119f63506326c17f58583fed Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 28 Apr 2022 16:49:30 -0700 Subject: [PATCH 29/32] indent fix --- code/modules/clothing/under/accessories/armor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 0e17cb7e67..e1538eec76 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -102,7 +102,7 @@ desc = "Advanced version of the standared exploration plate. Attaches to a plate carrier." //CHOMPADD icon_state = "armor_light" //CHOMPADD armor = list(melee = 45, bullet = 30, laser = 30, energy = 30, bomb = 35, bio = 75, rad = 35) //CHOMPADD -armorsoak = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) //CHOMPADD + armorsoak = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) //CHOMPADD /obj/item/clothing/accessory/armor/armorplate/stab name = "mesh armor plate" @@ -454,4 +454,4 @@ armorsoak = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = /obj/item/clothing/accessory/armor/helmcover/saare name = "\improper SAARE helmet cover" desc = "A fabric cover for armored helmets. This one has SAARE's colors." - icon_state = "helmcover_saare" \ No newline at end of file + icon_state = "helmcover_saare" From e5b114692eed2bc546b118cbad20bb723173a1e4 Mon Sep 17 00:00:00 2001 From: Tasald Date: Sun, 1 May 2022 11:44:12 -0700 Subject: [PATCH 30/32] Removed new armor Removed the new exploration armor so I can put it as a separate pr after staff talks about it. --- .../clothing/under/accessories/armor.dm | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index e1538eec76..c919899da9 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -97,13 +97,6 @@ icon_state = "armor_light" armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) - /obj/item/clothing/accessory/armor/armorplate/explorer/adv //CHOMPADD - name = "explorer armor plate" //CHOMPADD - desc = "Advanced version of the standared exploration plate. Attaches to a plate carrier." //CHOMPADD - icon_state = "armor_light" //CHOMPADD - armor = list(melee = 45, bullet = 30, laser = 30, energy = 30, bomb = 35, bio = 75, rad = 35) //CHOMPADD - armorsoak = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) //CHOMPADD - /obj/item/clothing/accessory/armor/armorplate/stab name = "mesh armor plate" desc = "A mesh armor plate made of steel-reinforced synthetic fibers, great for dealing with small blades. Attaches to a plate carrier." @@ -220,12 +213,6 @@ desc = "A pair of green arm pads reinforced with armor plating. Attaches to a plate carrier." icon_state = "armguards_green" armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) - -/obj/item/clothing/accessory/armor/armguards/explorer/adv //CHOMPADD - name = "explorer arm guards" //CHOMPADD - desc = "Advanced arm guards for explorers. Attaches to a plate carrier." //CHOMPADD - icon_state = "armguards_green" //CHOMPADD - armor = list(melee = 45, bullet = 30, laser = 30, energy = 30, bomb = 35, bio = 75, rad = 35) //CHOMPADD /obj/item/clothing/accessory/armor/armguards/merc name = "heavy arm guards" @@ -292,12 +279,6 @@ icon_state = "legguards_green" armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) -/obj/item/clothing/accessory/armor/legguards/explorer/adv //CHOMPADD - name = "explorer leg guards" //CHOMPADD - desc = "Advanced leg guards for explorers. Attaches to a plate carrier." //CHOMPADD - icon_state = "legguards_green" //CHOMPADD - armor = list(melee = 45, bullet = 30, laser = 30, energy = 30, bomb = 35, bio = 75, rad = 35) //CHOMPADD - /obj/item/clothing/accessory/armor/legguards/merc name = "heavy leg guards" desc = "A pair of heavily armored leg pads in red-trimmed black. Attaches to a plate carrier." From 1abc973117efe99a1383ceaae371df2e1cf98f4f Mon Sep 17 00:00:00 2001 From: Tasald Date: Sun, 1 May 2022 11:47:26 -0700 Subject: [PATCH 31/32] edit and removal Increased the price of the phasers and removed the new armor and denecrotizer from the vendor --- .../mining/ore_redemption_machine/survey_vendor.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 5a38a40442..264921b579 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -54,9 +54,9 @@ EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 50), EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100), EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), - EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 200), //CHOMPEDIT - EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/weapon/gun/energy/locked/frontier, 50), //CHOMPADD - EQUIPMENT("Defense Equipment - Holdout Phaser", /obj/item/weapon/gun/energy/locked/frontier/holdout, 75), //CHOMPADD + EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 400), //CHOMPEDIT + EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/weapon/gun/energy/locked/frontier, 150), //CHOMPADD + EQUIPMENT("Defense Equipment - Holdout Phaser", /obj/item/weapon/gun/energy/locked/frontier/holdout, 100), //CHOMPADD EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/weapon/kinetic_crusher/machete/dagger, 75), EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/weapon/kinetic_crusher/machete, 250), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), @@ -82,9 +82,6 @@ EQUIPMENT("Survival Equipment - Exploration Leg Guards", /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 - Large Storage Pouch", /obj/item/clothing/accessory/storage/pouches/large/green, 25), //CHOMPADD - EQUIPMENT("Survival Equipment - Advanced Plate", /obj/item/clothing/accessory/armor/armorplate/explorer/adv, 400), //CHOMPADD - EQUIPMENT("Survival Equipment - Advanced Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer/adv, 250), //CHOMPADD - EQUIPMENT("Survival Equipment - Advanced Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer/adv, 250), //CHOMPADD EQUIPMENT("Survival Equipment - Pathfinder Belt", /obj/item/weapon/storage/belt/explorer/pathfinder, 200), //CHOMPADD ) prize_list["Consumables"] = list( @@ -124,7 +121,6 @@ EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 100), EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 20), EQUIPMENT("UAV - Recon Skimmer", /obj/item/device/uav, 40), - EQUIPMENT("Denecrotizer", /obj/item/device/denecrotizer/medical, 2500), //CHOMPADD ) //VOREStation Edit End From 199ce43be6799d9e674983ef613d30c43719b6d4 Mon Sep 17 00:00:00 2001 From: Tasald Date: Thu, 22 Sep 2022 22:50:46 -0700 Subject: [PATCH 32/32] renamed riot shield to riot shield --- code/modules/mining/ore_redemption_machine/survey_vendor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 264921b579..14bac95bf3 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -79,7 +79,7 @@ EQUIPMENT("Survival Equipment - Exploration Plate", /obj/item/clothing/accessory/armor/armorplate/explorer, 50), //CHOMPADD EQUIPMENT("Survival Equipment - Exploration Arm Guards", /obj/item/clothing/accessory/armor/armguards/explorer, 50), //CHOMPADD EQUIPMENT("Survival Equipment - Exploration Leg Guards", /obj/item/clothing/accessory/armor/legguards/explorer, 50), //CHOMPADD - EQUIPMENT("Survival Equipment - Exploration Leg Guards", /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 - 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