From 23d60f137862b42d6474a902476a7a0acddbe5e9 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Tue, 26 Jul 2022 23:49:39 -0500 Subject: [PATCH 01/15] Adds Vox Engineering hardsuit to cargo Makes the thingy I just made actually obtainable. --- code/datums/supplypacks/voidsuits.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm index f8e091bb3d..d8aad46cda 100644 --- a/code/datums/supplypacks/voidsuits.dm +++ b/code/datums/supplypacks/voidsuits.dm @@ -259,4 +259,11 @@ cost = 80 containertype = /obj/structure/closet/crate/oculum containername = "Vox Civilian Hardsuit" + +/datum/supply_pack/voidsuits/voxeng + name = Vox Engineering Hardsuit + contains = list (obj/item/weapon/rig/vox/engineering) + cost = 150 + containertype = /obj/structure/closet/crate/oculum + containername = "Vox Engineering Hardsuit" //ChompEdit End From fc86d2e3014838ffc0d46e2193070495198d8325 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Tue, 26 Jul 2022 23:49:49 -0500 Subject: [PATCH 02/15] Adds an Engineering Hardsuit for vox it has sprites! It's got the same value as CE suit but shuffled to be focused to workplace injury prevention. It's something new! --- .../clothing/spacesuits/rig/suits/alien.dm | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 895a14be17..9dae089b24 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -152,3 +152,39 @@ initial_modules = list( ) +//ChompEdit Begins + +obj/item/weapon/rig/vox/engineering + suit_type = "sinister alien" + icon_state = "voxstealth_rig" + desc = "A lightweight, alien rig dedicated for construction and engineering tasks. Not reccomended for hostile engagement." + armor = list (melee = 25, bullet = 5, laser = 40, energy = 45, bomb = 50, bio = 100, rad = 100) //CE suit values but shuffled to a tighter focus on the job hazards + flags = PHORONGUARD + item_flags = THICKMATERIAL + siemens_coefficient = .1 + offline_slowdown = 2.5 + slowdown = 0 + emp_protection = 40 //change this to 30 if too high. + + req_one_access = list() + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage) + offline_vision_restriction = 1 + + initial_modules = list( + ) + + air_type = /obj/item/weapon/tank/vox + + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + + obj/item/weapon/rig/vox engine technition control module/equipped + req_access = list(access_engineering) + + initial_modules = list( + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/device/plasmacutter, + /obj/item/rig_module/device/rcd, + /obj/item/rig_module/vision/meson + ) + +//ChompEdit Ends From 65320b2d9bbc603513bee83f8d7c1466eae85a57 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:06:47 -0500 Subject: [PATCH 03/15] This is a big one Puts a space where one was missed, prepare for errors --- code/modules/clothing/spacesuits/rig/suits/alien.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 9dae089b24..e2c9168f33 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -143,7 +143,7 @@ suit_type = "sinister alien" icon_state = "voxstealth_rig" desc = "A light alien rig for repairs and maintenance to the outside of habitats and vessels." - armor = list(melee = 30, bullet = 10, laser = 20,energy = 25, bomb = 20, bio = 100, rad = 100) //Standard Engineering Suit Values + armor = list(melee = 30, bullet = 10, laser = 20, energy = 25, bomb = 20, bio = 100, rad = 100) //Standard Engineering Suit Values req_access = list() req_one_access = list() From 580e203db6e62c4fba180157f70f1718e717942b Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:08:29 -0500 Subject: [PATCH 04/15] Fixes my bad syntax --- code/modules/clothing/spacesuits/rig/suits/alien.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index e2c9168f33..7be67893ce 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -154,7 +154,7 @@ ) //ChompEdit Begins -obj/item/weapon/rig/vox/engineering +/obj/item/weapon/rig/vox/engineering suit_type = "sinister alien" icon_state = "voxstealth_rig" desc = "A lightweight, alien rig dedicated for construction and engineering tasks. Not reccomended for hostile engagement." @@ -177,7 +177,7 @@ obj/item/weapon/rig/vox/engineering max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE - obj/item/weapon/rig/vox engine technition control module/equipped + /obj/item/weapon/rig/vox_engine_technition_control_module/equipped req_access = list(access_engineering) initial_modules = list( From 336b2bdb7601dfa32bc011c4a88de1042b4f0b16 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:10:23 -0500 Subject: [PATCH 05/15] fixes more of my bad syntax --- code/datums/supplypacks/voidsuits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm index d8aad46cda..5b72478a57 100644 --- a/code/datums/supplypacks/voidsuits.dm +++ b/code/datums/supplypacks/voidsuits.dm @@ -261,7 +261,7 @@ containername = "Vox Civilian Hardsuit" /datum/supply_pack/voidsuits/voxeng - name = Vox Engineering Hardsuit + name = "Vox Engineering Hardsuit" contains = list (obj/item/weapon/rig/vox/engineering) cost = 150 containertype = /obj/structure/closet/crate/oculum From f9cfe780af9d619248e002f85126537df205227a Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:19:49 -0500 Subject: [PATCH 06/15] Fixes the syntax even more, i'm so good at coding --- code/datums/supplypacks/voidsuits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm index 5b72478a57..2d1ae7c99a 100644 --- a/code/datums/supplypacks/voidsuits.dm +++ b/code/datums/supplypacks/voidsuits.dm @@ -262,7 +262,7 @@ /datum/supply_pack/voidsuits/voxeng name = "Vox Engineering Hardsuit" - contains = list (obj/item/weapon/rig/vox/engineering) + contains = list (/obj/item/weapon/rig/vox/engineering) cost = 150 containertype = /obj/structure/closet/crate/oculum containername = "Vox Engineering Hardsuit" From 40f82a326993e29d257d2f6efc0fdef8b0308d08 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:27:15 -0500 Subject: [PATCH 07/15] HOPEFULLY LAST FIX --- code/modules/clothing/spacesuits/rig/suits/alien.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 7be67893ce..0ff6b2ab22 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -161,7 +161,7 @@ armor = list (melee = 25, bullet = 5, laser = 40, energy = 45, bomb = 50, bio = 100, rad = 100) //CE suit values but shuffled to a tighter focus on the job hazards flags = PHORONGUARD item_flags = THICKMATERIAL - siemens_coefficient = .1 + siemens_coefficient = 0.1 offline_slowdown = 2.5 slowdown = 0 emp_protection = 40 //change this to 30 if too high. From e8bf1c1b8a7fa1f4d7a023971faef2696ab485c8 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:30:37 -0500 Subject: [PATCH 08/15] I am so sorry --- code/modules/clothing/spacesuits/rig/suits/alien.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 0ff6b2ab22..8f0b5045de 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -178,7 +178,7 @@ max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/weapon/rig/vox_engine_technition_control_module/equipped - req_access = list(access_engineering) + req_access = list(access_engine) initial_modules = list( /obj/item/rig_module/maneuvering_jets, From 3b4e5291aac1b0f9f30c5249d6cf8b506dd728c1 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:36:26 -0500 Subject: [PATCH 09/15] One at a time, i will crawl to heaven --- code/modules/clothing/spacesuits/rig/suits/alien.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 8f0b5045de..1a2f99c67c 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -177,7 +177,7 @@ max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE - /obj/item/weapon/rig/vox_engine_technition_control_module/equipped +/obj/item/weapon/rig/vox_engine_technition_control_module/equipped req_access = list(access_engine) initial_modules = list( From 89baf6b92f596fff729251d6992076b11565f812 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Thu, 4 Aug 2022 15:41:28 -0500 Subject: [PATCH 10/15] Magboots armour? Adds the workboots and engineering values to magboots so they are minorly armoured now. --- code/modules/clothing/shoes/magboots.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index b775dcf98c..ac195a19f5 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -18,6 +18,7 @@ step_volume_mod = 1.3 drop_sound = 'sound/items/drop/metalboots.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' + armor = list (melee = 40, bullet = 10, laser = 10, energy = 20, bomb = 20, bio = 10, rad = 20) //magboots are also metal ass boots, they could take a bonk perhaps too //ChompEdit /obj/item/clothing/shoes/magboots/proc/set_slowdown() slowdown = shoes? max(SHOES_SLOWDOWN, shoes.slowdown): SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster. @@ -90,6 +91,7 @@ icon_state = "boots-vox" flags = PHORONGUARD species_restricted = list(SPECIES_VOX) + armor = list (melee = 40, bullet = 10, laser = 10, energy = 20, bomb = 20, bio = 10, rad = 20) //values of workboots and heavy duty engineering gloves, it's the only option that will ever be taken so may as well give the turkeys some protection //ChompEdit action_button_name = "Toggle the magclaws" @@ -126,4 +128,4 @@ /obj/item/clothing/shoes/magboots/vox/examine(mob/user) . = ..() if(magpulse) - . += "It would be hard to take these off without relaxing your grip first." // Theoretically this message should only be seen by the wearer when the claws are equipped. \ No newline at end of file + . += "It would be hard to take these off without relaxing your grip first." // Theoretically this message should only be seen by the wearer when the claws are equipped. From 30843dfb81eb5a059ae81c91cda839488ad18147 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Thu, 4 Aug 2022 15:55:39 -0500 Subject: [PATCH 11/15] Adds engineering glove armour to vox gauntlets because they only get the one option, may as well be decent --- code/modules/clothing/gloves/miscellaneous.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 8d7ec44f54..54b5451df0 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -115,6 +115,7 @@ species_restricted = list("Vox") drop_sound = 'sound/items/drop/metalboots.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' + armor = list (melee = 20, bullet = 15, laser = 10, energy = 10, bomb =5, bio = 30, rad = 30) //gently bumped up Heavy engineering gloves value for protection //ChompEdit cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE From df3368361f4c90cfcbe4ae8283e00eef358a924b Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:21:20 -0500 Subject: [PATCH 12/15] Deletes Magboots changes I was educated, This is not how to do the thing I was trying to do correctly. --- code/modules/clothing/shoes/magboots.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index ac195a19f5..3960eff67d 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -18,7 +18,6 @@ step_volume_mod = 1.3 drop_sound = 'sound/items/drop/metalboots.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' - armor = list (melee = 40, bullet = 10, laser = 10, energy = 20, bomb = 20, bio = 10, rad = 20) //magboots are also metal ass boots, they could take a bonk perhaps too //ChompEdit /obj/item/clothing/shoes/magboots/proc/set_slowdown() slowdown = shoes? max(SHOES_SLOWDOWN, shoes.slowdown): SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster. @@ -91,8 +90,7 @@ icon_state = "boots-vox" flags = PHORONGUARD species_restricted = list(SPECIES_VOX) - armor = list (melee = 40, bullet = 10, laser = 10, energy = 20, bomb = 20, bio = 10, rad = 20) //values of workboots and heavy duty engineering gloves, it's the only option that will ever be taken so may as well give the turkeys some protection //ChompEdit - + action_button_name = "Toggle the magclaws" /obj/item/clothing/shoes/magboots/vox/attack_self(mob/user) From edf63fdd44b2cee49f750a8fcd561507890f7327 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Wed, 24 Aug 2022 18:26:39 -0500 Subject: [PATCH 13/15] updating wip correctly (?) applies armour just to vox boots. --- code/modules/clothing/shoes/magboots.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 3960eff67d..de57754e91 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -91,6 +91,8 @@ flags = PHORONGUARD species_restricted = list(SPECIES_VOX) + armor = list (melee = 40, bullet = 10, laser = 10, energy = 20, bomb = 20, bio = 10, rad = 20) //values of workboots and heavy duty engineering gloves, it's the only option that will ever be taken so may as well give the turkeys some protection //ChompEdit + action_button_name = "Toggle the magclaws" /obj/item/clothing/shoes/magboots/vox/attack_self(mob/user) From b9936849190ad46afc99468a63785ac82b91aea7 Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Wed, 24 Aug 2022 18:39:02 -0500 Subject: [PATCH 14/15] further updating wip corrects and names the suit this time --- code/modules/clothing/spacesuits/rig/suits/alien.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 1a2f99c67c..ee83d986a2 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -155,13 +155,14 @@ //ChompEdit Begins /obj/item/weapon/rig/vox/engineering + name = "fluid alien control module" suit_type = "sinister alien" icon_state = "voxstealth_rig" desc = "A lightweight, alien rig dedicated for construction and engineering tasks. Not reccomended for hostile engagement." armor = list (melee = 25, bullet = 5, laser = 40, energy = 45, bomb = 50, bio = 100, rad = 100) //CE suit values but shuffled to a tighter focus on the job hazards flags = PHORONGUARD item_flags = THICKMATERIAL - siemens_coefficient = 0.1 + siemens_coefficient = 0 offline_slowdown = 2.5 slowdown = 0 emp_protection = 40 //change this to 30 if too high. From 660afaa39d7c6c451d8040a6543cb881ba442a9e Mon Sep 17 00:00:00 2001 From: crabcube <88477406+crabcube@users.noreply.github.com> Date: Wed, 24 Aug 2022 21:44:08 -0500 Subject: [PATCH 15/15] Testing to clear the X Functions fine on test but said X here on integration --- code/modules/clothing/shoes/magboots.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index de57754e91..125eedd9ab 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -90,7 +90,6 @@ icon_state = "boots-vox" flags = PHORONGUARD species_restricted = list(SPECIES_VOX) - armor = list (melee = 40, bullet = 10, laser = 10, energy = 20, bomb = 20, bio = 10, rad = 20) //values of workboots and heavy duty engineering gloves, it's the only option that will ever be taken so may as well give the turkeys some protection //ChompEdit action_button_name = "Toggle the magclaws"