diff --git a/baystation12.dme b/baystation12.dme index 151558b2d64..7ce223f3167 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1663,26 +1663,19 @@ #include "code\modules\clothing\spacesuits\rig\suits\cseco.dm" #include "code\modules\clothing\spacesuits\rig\suits\engineering.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert.dm" -#include "code\modules\clothing\spacesuits\rig\suits\excavation.dm" #include "code\modules\clothing\spacesuits\rig\suits\firesuit.dm" -#include "code\modules\clothing\spacesuits\rig\suits\flesh.dm" #include "code\modules\clothing\spacesuits\rig\suits\hacker.dm" #include "code\modules\clothing\spacesuits\rig\suits\light.dm" #include "code\modules\clothing\spacesuits\rig\suits\marine.dm" #include "code\modules\clothing\spacesuits\rig\suits\marksman.dm" #include "code\modules\clothing\spacesuits\rig\suits\merc.dm" #include "code\modules\clothing\spacesuits\rig\suits\mining.dm" -#include "code\modules\clothing\spacesuits\rig\suits\patrol.dm" -#include "code\modules\clothing\spacesuits\rig\suits\riot.dm" #include "code\modules\clothing\spacesuits\rig\suits\scaf.dm" -#include "code\modules\clothing\spacesuits\rig\suits\sea.dm" #include "code\modules\clothing\spacesuits\rig\suits\security.dm" #include "code\modules\clothing\spacesuits\rig\suits\specialforces.dm" #include "code\modules\clothing\spacesuits\rig\suits\station.dm" -#include "code\modules\clothing\spacesuits\rig\suits\tarnished.dm" #include "code\modules\clothing\spacesuits\rig\suits\unitologist.dm" #include "code\modules\clothing\spacesuits\rig\suits\vintage.dm" -#include "code\modules\clothing\spacesuits\rig\suits\wasp.dm" #include "code\modules\clothing\spacesuits\void\merc.dm" #include "code\modules\clothing\spacesuits\void\misc.dm" #include "code\modules\clothing\spacesuits\void\station.dm" diff --git a/code/datums/craft/recipes/rig.dm b/code/datums/craft/recipes/rig.dm index 5b054dff9f7..c307c89dab2 100644 --- a/code/datums/craft/recipes/rig.dm +++ b/code/datums/craft/recipes/rig.dm @@ -14,6 +14,28 @@ list(CRAFT_TOOL, QUALITY_WIRE_CUTTING, 10, WORKTIME_NORMAL, FAILCHANCE_NORMAL, SKILL_ELECTRICAL) ) +/datum/craft_recipe/rig/intermediate + name = "Intermediate Engineering RIG" + desc = "Upgrade a Standard Engineering RIG into a Intermediate Engineering RIG" + time = 50 + result = /obj/item/rig/intermediate + steps = list( + list(CRAFT_OBJECT, /obj/item/rig/engineering), + list(CRAFT_STACK, /obj/item/stack/power_node, 3), + list(CRAFT_TOOL, QUALITY_WIRE_CUTTING, 10, WORKTIME_NORMAL, FAILCHANCE_NORMAL, SKILL_ELECTRICAL) + ) + +/datum/craft_recipe/rig/excavation + name = "Intermediate Mining RIG" + desc = "Upgrade a Standard Mining RIG into a Intermediate Mining RIG" + time = 50 + result = /obj/item/rig/excavation + steps = list( + list(CRAFT_OBJECT, /obj/item/rig/mining), + list(CRAFT_STACK, /obj/item/stack/power_node, 3), + list(CRAFT_TOOL, QUALITY_WIRE_CUTTING, 10, WORKTIME_NORMAL, FAILCHANCE_NORMAL, SKILL_ELECTRICAL) + ) + /datum/craft_recipe/rig/flesh name = "Odd RIG" desc = "Upgrade a zealot rig into a odd rig" diff --git a/code/datums/craft/recipes/weapon.dm b/code/datums/craft/recipes/weapon.dm index ed0ca6199b9..b1ae865ec37 100644 --- a/code/datums/craft/recipes/weapon.dm +++ b/code/datums/craft/recipes/weapon.dm @@ -4,6 +4,15 @@ icon_state = "gun" +/datum/craft_recipe/weapon/unitologist + name = "unitology ritual blade" + result = /obj/item/material/knife/unitologist + steps = list( + list(CRAFT_OBJECT, /obj/item/material/knife) + ) + + + /datum/craft_recipe/weapon/baseballbat name = "baseball bat" result = /obj/item/material/twohanded/baseballbat @@ -189,6 +198,7 @@ /datum/craft_recipe/weapon/rendingcutter name = "Rending Cutter" result = /obj/item/gun/energy/cutter/rending + flags = CRAFT_ON_WORKBENCH time = 200 steps = list( list(CRAFT_OBJECT, /obj/item/gun/energy/cutter/plasma, WORKTIME_NORMAL, FALSE, /obj/item/gun/energy/cutter/rending), @@ -198,6 +208,7 @@ /datum/craft_recipe/weapon/rendingdivet name = "Rending Divet" result = /obj/item/gun/projectile/divet/rending + flags = CRAFT_ON_WORKBENCH time = 200 steps = list( list(CRAFT_OBJECT, /obj/item/gun/projectile/divet, WORKTIME_NORMAL, FALSE, /obj/item/gun/projectile/divet/rending), diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index 23e87615400..e272bfac28e 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -167,7 +167,7 @@ /decl/hierarchy/supply_pack/security/rig_security name = "T2 RIG - Security" - contains = list(/obj/item/rig/security = 1) + contains = list(/obj/item/rig/pcsi/security = 1) cost = 150 containertype = /obj/structure/closet/crate/secure/large containername = "\improper security RIG crate" @@ -176,7 +176,7 @@ /decl/hierarchy/supply_pack/security/rig_patrol name = "T2 RIG - Patrol" - contains = list(/obj/item/rig/patrol = 1) + contains = list(/obj/item/rig/riot/patrol = 1) cost = 150 containertype = /obj/structure/closet/crate/secure/large containername = "\improper patrol RIG crate" diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm index c1a0eb3df29..6796c624145 100644 --- a/code/datums/uplink/medical.dm +++ b/code/datums/uplink/medical.dm @@ -23,7 +23,7 @@ /datum/uplink_item/item/medical/medigel_small name = "small medical gel injector" - item_cost = 8 + item_cost = 6 path = /obj/item/reagent_containers/hypospray/autoinjector/ds_medigel/small is_special = TRUE antag_roles = list(MODE_EARTHGOV_AGENT, MODE_UNITOLOGIST, MODE_UNITOLOGIST_SHARD) diff --git a/code/game/jobs/job/cargo.dm b/code/game/jobs/job/cargo.dm index 163ea4acd9e..109e575b4ae 100644 --- a/code/game/jobs/job/cargo.dm +++ b/code/game/jobs/job/cargo.dm @@ -67,8 +67,8 @@ department = "Supply" abbreviation = "ST" department_flag = SUP - total_positions = 15 - spawn_positions = 15 + total_positions = 3 + spawn_positions = 3 supervisors = "the Supply Officer" selection_color = "#3b3b3b" minimal_player_age = 18 diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 5e6ce751554..c546ef6ba3c 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -31,8 +31,8 @@ title = "Line Cook" abbreviation = "LC" department_flag = SRV - total_positions = 7 - spawn_positions = 7 + total_positions = 2 + spawn_positions = 2 supervisors = "the First Lieutenant" selection_color = "#006200" minimal_player_age = 18 @@ -60,8 +60,8 @@ title = "Botanist" abbreviation = "BOT" department_flag = SRV - total_positions = 6 - spawn_positions = 6 + total_positions = 2 + spawn_positions = 2 supervisors = "the First Lieutenant" selection_color = "#006200" minimal_player_age = 18 @@ -88,8 +88,8 @@ title = "Janitor" abbreviation = "JTR" department_flag = SRV - total_positions = 20 - spawn_positions = 20 + total_positions = 3 + spawn_positions = 3 supervisors = "the First Lieutenant" selection_color = "#6c0864" minimal_player_age = 18 diff --git a/code/game/jobs/job/ishimura/medical.dm b/code/game/jobs/job/ishimura/medical.dm index e6227c8e10d..7fb9aecbcbc 100644 --- a/code/game/jobs/job/ishimura/medical.dm +++ b/code/game/jobs/job/ishimura/medical.dm @@ -41,8 +41,8 @@ department = "Medical" abbreviation = "MD" department_flag = MED - total_positions = 6 - spawn_positions = 6 + total_positions = 5 + spawn_positions = 5 supervisors = "the Senior Medical Officer" selection_color = "#013d3b" minimal_player_age = 18 diff --git a/code/game/jobs/job/ishimura/mining.dm b/code/game/jobs/job/ishimura/mining.dm index 9b1ef739ff3..64fa873f259 100644 --- a/code/game/jobs/job/ishimura/mining.dm +++ b/code/game/jobs/job/ishimura/mining.dm @@ -77,7 +77,7 @@ abbreviation = "PC" department = "Mining" department_flag = MIN - total_positions = 25 + total_positions = 100 spawn_positions = 25 supervisors = "the Mining Foreman" selection_color = "#5e4215" diff --git a/code/game/jobs/job/ishimura/security.dm b/code/game/jobs/job/ishimura/security.dm index cbc295a8978..8a031e1dd27 100644 --- a/code/game/jobs/job/ishimura/security.dm +++ b/code/game/jobs/job/ishimura/security.dm @@ -41,8 +41,8 @@ department = "Security" abbreviation = "SSO" department_flag = SEC - total_positions = 1 - spawn_positions = 1 + total_positions = 2 + spawn_positions = 2 supervisors = "the Chief Security Officer" selection_color = "#601c1c" minimal_player_age = 18 @@ -72,8 +72,8 @@ department = "Security" abbreviation = "SEC" department_flag = SEC - total_positions = 4 - spawn_positions = 4 + total_positions = 15 + spawn_positions = 15 supervisors = "the Chief Security Officer and Senior Security Officer" selection_color = "#601c1c" minimal_player_age = 18 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index e659c7564cc..1d59965faa2 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -42,8 +42,8 @@ department = "Medical" abbreviation = "MD" department_flag = MED - total_positions = 15 - spawn_positions = 15 + total_positions = 5 + spawn_positions = 5 supervisors = "the Senior Medical Officer" selection_color = "#013d3b" minimal_player_age = 18 @@ -74,8 +74,8 @@ department = "Medical" abbreviation = "SRG" department_flag = MED - total_positions = 5 - spawn_positions = 5 + total_positions = 2 + spawn_positions = 2 supervisors = "the Senior Medical Officer" selection_color = "#013d3b" minimal_player_age = 18 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 2e0f9895bf6..8bfad35a616 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -45,8 +45,8 @@ department = "Science" abbreviation = "RA" department_flag = SCI - total_positions = 10 - spawn_positions = 10 + total_positions = 4 + spawn_positions = 4 supervisors = "the Chief Science Officer" selection_color = "#633d63" minimal_player_age = 18 diff --git a/code/game/machinery/vending_miner.dm b/code/game/machinery/vending_miner.dm index 757c654888e..c583b9712f7 100644 --- a/code/game/machinery/vending_miner.dm +++ b/code/game/machinery/vending_miner.dm @@ -47,6 +47,8 @@ /obj/item/gun/spray/hydrazine_torch = 10, /obj/item/reagent_containers/glass/fuel_tank/fuel = 25, /obj/item/reagent_containers/glass/fuel_tank/hydrazine = 10, + /obj/item/rig/excavation = 10, + /obj/item/rig/advanced/mining = 5, ) prices = list( /obj/item/stack/power_node = 5000, @@ -90,6 +92,8 @@ /obj/item/gun/spray/hydrazine_torch = 8000, /obj/item/reagent_containers/glass/fuel_tank/fuel = 2000, /obj/item/reagent_containers/glass/fuel_tank/hydrazine = 4000, + /obj/item/rig/excavation = 10000, + /obj/item/rig/advanced/mining = 20000, ) /obj/machinery/vending/mining/attackby(obj/item/W, mob/user) diff --git a/code/game/objects/items/stacks/power_node.dm b/code/game/objects/items/stacks/power_node.dm index 9cf0a508cf3..9cee98caff3 100644 --- a/code/game/objects/items/stacks/power_node.dm +++ b/code/game/objects/items/stacks/power_node.dm @@ -1,36 +1,36 @@ -/obj/item/stack/power_node - name = "power nodes" - desc = "It seems to be radiating a lot of energy." - singular_name = "power node" - icon = 'icons/obj/tools.dmi' - icon_state = "powernode" - w_class = ITEM_SIZE_SMALL - max_amount = 20 - item_flags = ITEM_FLAG_NO_BLUDGEON - origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4) - -/obj/item/stack/special_node - name = "cutter nodes" - desc = "A power node that seems to have been built to specifically enhance a plasma cutter in a strange manner." - singular_name = "cutter node" - icon = 'icons/obj/tools.dmi' - color = "#e97f83" - icon_state = "powernode" - w_class = ITEM_SIZE_SMALL - max_amount = 20 - item_flags = ITEM_FLAG_NO_BLUDGEON - origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4) - -obj/item/stack/special_node/cutter - -obj/item/stack/special_node/divet - desc = "A power node that seems to have been built to specifically enhance a divet gun in a strange manner." - name = "divet nodes" - singular_name = "divet node" - color = "#6e6ec1" - -obj/item/stack/special_node/evil - desc = "A strange power note emanating with an evil aura." - name = "divet nodes" - singular_name = "divet node" +/obj/item/stack/power_node + name = "power nodes" + desc = "It seems to be radiating a lot of energy." + singular_name = "power node" + icon = 'icons/obj/tools.dmi' + icon_state = "powernode" + w_class = ITEM_SIZE_SMALL + max_amount = 20 + item_flags = ITEM_FLAG_NO_BLUDGEON + origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4) + +/obj/item/stack/special_node + name = "cutter nodes" + desc = "A power node that seems to have been built to specifically enhance a plasma cutter in a strange manner." + singular_name = "cutter node" + icon = 'icons/obj/tools.dmi' + color = "#e97f83" + icon_state = "powernode" + w_class = ITEM_SIZE_SMALL + max_amount = 20 + item_flags = ITEM_FLAG_NO_BLUDGEON + origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4) + +obj/item/stack/special_node/cutter + +obj/item/stack/special_node/divet + desc = "A power node that seems to have been built to specifically enhance a divet gun in a strange manner." + name = "divet nodes" + singular_name = "divet node" + color = "#6e6ec1" + +obj/item/stack/special_node/evil + desc = "A strange power note emanating with an evil aura." + name = "evil nodes" + singular_name = "evil node" color = "#740909" \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/light.dm b/code/game/objects/items/weapons/grenades/light.dm index fe0250e327a..bb448d443d8 100644 --- a/code/game/objects/items/weapons/grenades/light.dm +++ b/code/game/objects/items/weapons/grenades/light.dm @@ -4,16 +4,21 @@ icon_state = "lightgrenade" item_state = "flashbang" det_time = 20 - light_range = 12 + light_range = 6 light_power = 1 light_on = FALSE /obj/item/grenade/light/detonate() ..() var/lifetime = rand(2 MINUTES, 4 MINUTES) - var/colour = pick("#49f37c", "#fc0f29", "#599dff", "#fa7c0b", "#fef923") + var/color = pick("#49f37c", "#fc0f29", "#599dff", "#fa7c0b", "#fef923") playsound(src, 'sound/effects/snap.ogg', 80, 1) audible_message("\The [src] detonates with a sharp crack!") - set_light_color(colour) + set_light_color(color) QDEL_IN(src, lifetime) + + if (active) + set_light_on(TRUE) + else + set_light_on(FALSE) \ No newline at end of file diff --git a/code/game/objects/items/weapons/tools/pickaxe.dm b/code/game/objects/items/weapons/tools/pickaxe.dm index 46c804ea335..a0b5aedf8f6 100644 --- a/code/game/objects/items/weapons/tools/pickaxe.dm +++ b/code/game/objects/items/weapons/tools/pickaxe.dm @@ -87,7 +87,7 @@ force = WEAPON_FORCE_NORMAL throwforce = WEAPON_FORCE_NORMAL item_state = "ds_rocksaw0" - w_class = ITEM_SIZE_HUGE + w_class = ITEM_SIZE_NORMAL matter = list(MATERIAL_STEEL = 1200, MATERIAL_PLASTIC = 800) tool_qualities = list() switched_on_qualities = list(QUALITY_DIGGING = 50, QUALITY_DRILLING = 20, QUALITY_EXCAVATION = 15, QUALITY_SAWING = 60, QUALITY_CUTTING = 50) diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index e6fe564db23..17d840d88c7 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -94,9 +94,9 @@ something, make sure it's not in one of the other lists.*/ /obj/random/scaf/item_to_spawn() //total weight = 100 return pickweight(list( - /obj/item/rig/arctic = 4, - /obj/item/rig/scaf/elite = 4, - /obj/item/rig/scaf/legionnaire = 4, + /obj/item/rig/advanced/arctic = 4, + /obj/item/rig/pcsi/elite = 4, + /obj/item/rig/pcsi/legionnaire = 4, /obj/item/gun/projectile/automatic/bullpup = 10, /obj/item/ammo_magazine/bullpup = 18, /obj/random/medical = 15, diff --git a/code/game/objects/random/rig.dm b/code/game/objects/random/rig.dm index 96e06ae14f6..f9fb99a4515 100644 --- a/code/game/objects/random/rig.dm +++ b/code/game/objects/random/rig.dm @@ -5,21 +5,21 @@ icon_state = "generic" /obj/random/hardsuit/item_to_spawn() - return pickweight(list(/obj/item/rig/security, + return pickweight(list(/obj/item/rig/pcsi/security, /obj/item/rig/engineering, + /obj/item/rig/hacker, /obj/item/rig/mining, - /obj/item/rig/excavation, - /obj/item/rig/vintage = 0.2, - /obj/item/rig/advanced = 0.1, //At 0.5, they are still very common, shouldn't even be "misplaced" anyway. - /obj/item/rig/patrol = 0.1, - /obj/item/rig/industrial, - /obj/item/rig/eva, - /obj/item/rig/civilian, + /obj/item/rig/excavation = 0.5, + /obj/item/rig/intermediate = 0.5, + /obj/item/rig/vintage = 0.1, + /obj/item/rig/advanced = 0.1, + /obj/item/rig/advanced/engineering = 0.1, + /obj/item/rig/advanced/mining = 0.1, + /obj/item/rig/riot = 0.2, + /obj/item/rig/riot/patrol = 0.2, + /obj/item/rig/civilian/slim, + /obj/item/rig/civilian/inap = 0.1, /obj/item/rig/medical = 0.8, - /obj/item/rig/light/internalaffairs = 0.01, - /obj/item/rig/ce = 0.01, - /obj/item/rig/hazmat = 0.01, - /obj/item/rig/hazard = 0.01, /obj/item/rig/clown = 0.01)) @@ -62,12 +62,13 @@ /obj/random/rig_module/rare possible_spawns = list(/obj/item/rig_module/kinesis/advanced = 0.5, /obj/item/rig_module/healthbar/advanced = 1, + /obj/item/rig_module/kinesis/advanced = 0.5, /obj/item/rig_module/storage/heavy = 0.5, /obj/item/rig_module/vision/thermal = 0.2, + /obj/item/rig_module/vision/multi = 0.1, /obj/item/rig_module/chem_dispenser/inaprovaline = 0.1, /obj/item/rig_module/chem_dispenser/ninja = 0.2, /obj/item/rig_module/self_destruct = 0.2, - /obj/item/rig_module/power_sink = 0.5, /obj/item/rig_module/grenade_launcher = 0.2, /obj/item/rig_module/grenade_launcher/smoke = 0.5, /obj/item/rig_module/grenade_launcher/mfoam = 0.5, diff --git a/code/game/objects/random/weapons.dm b/code/game/objects/random/weapons.dm index 960f2a4020f..6c63540e9cd 100644 --- a/code/game/objects/random/weapons.dm +++ b/code/game/objects/random/weapons.dm @@ -41,6 +41,7 @@ return pickweight(list( /obj/item/gun/projectile/ripper = 0.8, /obj/item/gun/energy/forcegun = 1, + /obj/item/gun/projectile/rivet = 0.8,, /obj/item/gun/energy/cutter = 2, /obj/item/gun/energy/cutter/plasma = 0.8, /obj/item/gun/energy/cutter/rending = 0.4, @@ -69,6 +70,7 @@ /obj/item/ammo_magazine/pulse/df = 0.3, /obj/item/cell/plasmacutter = 3, /obj/item/ammo_magazine/sawblades = 1.2, + /obj/item/ammo_magazine/rivet = 1, ///obj/item/ammo_magazine/bullpup = 1, /obj/item/cell/force = 1, /obj/item/ammo_magazine/seeker = 0.6, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index c711b11956e..2848d2a36eb 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -13,7 +13,7 @@ new/datum/atom_creator/simple(/obj/item/storage/backpack/dufflebag/eng, 50), /obj/item/clothing/accessory/storage/brown_vest, /obj/item/blueprints, - /obj/item/rig/advanced, + /obj/item/rig/advanced/engineering, /obj/item/clothing/under/deadspace/engineer, /obj/item/clothing/head/hardhat/white, /obj/item/clothing/head/welding, diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 9328e4a8b00..2b07fe73bca 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -44,14 +44,14 @@ if ("tank") new /obj/item/tank/emergency/oxygen/engi(src) new /obj/item/tank/emergency/oxygen/engi(src) - new /obj/item/rig/emergency(src) + new /obj/item/rig/emergency/astro(src) new /obj/item/clothing/mask/gas/half(src) new /obj/item/clothing/mask/gas/half(src) new /obj/random/tool_upgrade(src) if ("large") new /obj/item/tank/emergency/oxygen/double(src) new /obj/item/tank/emergency/oxygen/double(src) - new /obj/item/rig/emergency(src) + new /obj/item/rig/emergency/astro(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/mask/gas(src) new /obj/item/oxycandle(src) @@ -59,7 +59,7 @@ new /obj/item/storage/toolbox/emergency(src) new /obj/item/tank/emergency/oxygen/engi(src) new /obj/item/tank/emergency/oxygen/engi(src) - new /obj/item/rig/emergency(src) + new /obj/item/rig/emergency/astro(src) new /obj/item/clothing/mask/gas/half(src) new /obj/item/clothing/mask/gas/half(src) new /obj/item/storage/firstaid/o2(src) diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 9cb0f3083e9..0671e05daed 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -391,8 +391,6 @@ return 1 /obj/item/rig_module/maneuvering_jets/activate() - if(!..()) - return if(active) return 0 diff --git a/code/modules/clothing/spacesuits/rig/suits/advanced.dm b/code/modules/clothing/spacesuits/rig/suits/advanced.dm index 80cc38d3052..c16dfb02e41 100644 --- a/code/modules/clothing/spacesuits/rig/suits/advanced.dm +++ b/code/modules/clothing/spacesuits/rig/suits/advanced.dm @@ -1,75 +1,74 @@ -/* - Advanced RIG - - High quality all around. Lightweight, good protection, no real drawbacks. The next generation of awesome -*/ - -/obj/item/rig/advanced - name = "Advanced RIG" - desc = "The latest in cutting-edge RIG technology. Lightweight, tough, and packed with utilities" - icon_state = "ds_advanced_rig" - - //Armor values are slightly higher than security rig in all categories - armor = list(melee = 60, bullet = 60, laser = 60, energy = 30, bomb = 65, bio = 100, rad = 95) - offline_slowdown = RIG_VERY_HEAVY - online_slowdown = RIG_LIGHT - acid_resistance = 3 //Contains a fair bit of plastic - - seal_delay = 45 - - chest_type = /obj/item/clothing/suit/space/rig/advanced - helm_type = /obj/item/clothing/head/helmet/space/rig/advanced - boot_type = /obj/item/clothing/shoes/magboots/rig/advanced - glove_type = /obj/item/clothing/gloves/rig/advanced - - - initial_modules = list( - /obj/item/rig_module/healthbar/advanced, - /obj/item/rig_module/storage/heavy, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/meson, - /obj/item/rig_module/kinesis/advanced, - /obj/item/rig_module/hotswap, - /obj/item/rig_module/power_sink - ) - -/obj/item/clothing/head/helmet/space/rig/advanced - name = "helmet" - -/obj/item/clothing/suit/space/rig/advanced - name = "suit" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/advanced - name = "insulated gloves" - desc = "These gloves will protect the wearer from electric shocks." - siemens_coefficient = 0 - -/obj/item/clothing/shoes/magboots/rig/advanced - name = "boots" - - -/obj/item/rig/advanced/maxstone - name = "Advanced Engineering RIG" - desc = "The latest in cutting-edge RIG technology, uses the standard engineering suit scheme. It has `Parker R.` engraved next to the monitor lights." - icon_state = "ds_advanced_rig_stone" - -/obj/item/rig/advanced/banditofdoom - name = "Evangelion RIG" - desc = "A project many months in the works, created by an obsessive historical anime fan. Even incorporates a custom voice changer for impersonating TV characters." - icon_state = "banditofdoom_rig" - online_slowdown = RIG_FLEXIBLE - - initial_modules = list( - /obj/item/rig_module/healthbar/advanced, - /obj/item/rig_module/storage/heavy, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/meson, - /obj/item/rig_module/kinesis/advanced, - /obj/item/rig_module/hotswap, - /obj/item/rig_module/power_sink, - /obj/item/rig_module/voice - ) \ No newline at end of file +/* + Advanced RIG + + High quality all around. Lightweight, good protection, no real drawbacks. The next generation of awesome +*/ + +/obj/item/rig/advanced + name = "Advanced RIG" + desc = "The latest in cutting-edge RIG technology. Lightweight, tough, and packed with utilities" + icon_state = "ds_advanced_rig" + + //Armor values are slightly higher than security rig in all categories + armor = list(melee = 60, bullet = 60, laser = 60, energy = 30, bomb = 65, bio = 100, rad = 95) + offline_slowdown = RIG_VERY_HEAVY + online_slowdown = RIG_LIGHT + acid_resistance = 3 //Contains a fair bit of plastic + + chest_type = /obj/item/clothing/suit/space/rig/advanced + helm_type = /obj/item/clothing/head/helmet/space/rig/advanced + boot_type = /obj/item/clothing/shoes/magboots/rig/advanced + glove_type = /obj/item/clothing/gloves/rig/advanced + + + initial_modules = list( + /obj/item/rig_module/healthbar/advanced, + /obj/item/rig_module/storage/heavy, + /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/meson, + /obj/item/rig_module/kinesis/advanced, + /obj/item/rig_module/hotswap, + /obj/item/rig_module/power_sink + ) + +/obj/item/clothing/head/helmet/space/rig/advanced + name = "helmet" + +/obj/item/clothing/suit/space/rig/advanced + name = "suit" + valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) + restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) + +/obj/item/clothing/gloves/rig/advanced + name = "insulated gloves" + desc = "These gloves will protect the wearer from electric shocks." + siemens_coefficient = 0 + +/obj/item/clothing/shoes/magboots/rig/advanced + name = "boots" + +/obj/item/rig/advanced/maxstone + name = "Advanced Engineering RIG" + desc = "The latest in cutting-edge RIG technology, uses the standard engineering suit scheme. It has `Parker R.` engraved next to the monitor lights." + icon_state = "ds_advanced_rig_stone" + +/obj/item/rig/advanced/banditofdoom + name = "Evangelion RIG" + desc = "A project many months in the works, created by an obsessive historical anime fan. Even incorporates a custom voice changer for impersonating TV characters." + icon_state = "banditofdoom_rig" + +/obj/item/rig/advanced/dad + name = "Elite Diving RIG" + desc = "The elite diving RIG is the next generation of diving RIGs used among CEC deep sea mining operations. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility." + icon_state = "elite_diving_rig" + +/obj/item/rig/advanced/sister + name = "Strange Diving RIG" + desc = "a strange diving RIG with a cage on the shoulder and symbols drawn upon the suit. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility." + icon_state = "sister_rig" + +/obj/item/rig/advanced/tarnished + name = "Tarnished RIG" + desc = "A rig made from the reforged armor of his family that was passed from generation to generations for decades." + icon_state = "tarnished" diff --git a/code/modules/clothing/spacesuits/rig/suits/arctic.dm b/code/modules/clothing/spacesuits/rig/suits/arctic.dm index 6d8cefdf124..e85d5e115ae 100644 --- a/code/modules/clothing/spacesuits/rig/suits/arctic.dm +++ b/code/modules/clothing/spacesuits/rig/suits/arctic.dm @@ -1,29 +1,13 @@ -/obj/item/rig/arctic +/obj/item/rig/advanced/arctic name = "Arctic Survival RIG" desc = "A standard-issue Sovereign Colonies RIG used for exploring and generally weathering harsh environments otherwise hostile to human life, from space to an icy alien tundra." icon_state = "arctic_survival_rig" - armor = list(melee = 60, bullet = 60, laser = 60, energy = 30, bomb = 65, bio = 100, rad = 95) //cut and paste from advanced suit, no change - offline_slowdown = RIG_VERY_HEAVY //this thing's a winter coat and armor at the same time! - online_slowdown = RIG_LIGHT //but it's also purpose-built for staying mobile - acid_resistance = 3 - seal_delay = 45 chest_type = /obj/item/clothing/suit/space/rig/arctic helm_type = /obj/item/clothing/head/helmet/space/rig/arctic boot_type = /obj/item/clothing/shoes/magboots/rig/arctic glove_type = /obj/item/clothing/gloves/rig/arctic - initial_modules = list( - /obj/item/rig_module/healthbar/advanced, - /obj/item/rig_module/storage/heavy, - /obj/item/rig_module/grenade_launcher/light, - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/meson, - /obj/item/rig_module/kinesis/advanced, - /obj/item/rig_module/hotswap, - /obj/item/rig_module/power_sink - ) - /obj/item/clothing/head/helmet/space/rig/arctic light_overlay = "arctic_light" @@ -37,9 +21,10 @@ siemens_coefficient = 0 /obj/item/clothing/shoes/magboots/rig/arctic + name = "boots" -/obj/item/rig/arctic/witness //donor variant - basically the same as the advanced suit, but looks dope +/obj/item/rig/advanced/arctic/witness //donor variant - basically the same as the advanced suit, but looks dope name = "witness RIG" desc = "A Sovereign Colonies all-purpose survival RIG painted in a mesmerizing fashion as a tribute to the Church of Unitology and the general faith they hold." icon_state = "witness_rig" - + diff --git a/code/modules/clothing/spacesuits/rig/suits/civilian.dm b/code/modules/clothing/spacesuits/rig/suits/civilian.dm index 5820ce345cd..0f628f8b7b6 100644 --- a/code/modules/clothing/spacesuits/rig/suits/civilian.dm +++ b/code/modules/clothing/spacesuits/rig/suits/civilian.dm @@ -22,24 +22,19 @@ name = "CEC Slim Civilian RIG" desc = "Slim variant of the Resource Integrated Gear. Standard issue for all CEC employees." icon_state = "ds_civilian_rig_slim" - armor = list(melee = 10, bullet = 10, laser = 10, energy = 10, bomb = 10, bio = 10, rad = 10) - offline_slowdown = 1 - online_slowdown = RIG_VERY_LIGHT - max_health = 1500 - - chest_type = null - helm_type = null - boot_type = null - glove_type = null +/obj/item/rig/civilian/inap + name = "Inap RIG" + desc = "Resource Integrated Gear, made of pure inap." + icon_state = "inapprig" /obj/item/rig/emergency name = "Emergency RIG" desc = "A light, emergency rig for use by non-qualified personnel in the case of emergency decompression." icon_state = "eva_suit" - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 50) - online_slowdown = 1 - offline_slowdown = 3 + armor = list(melee = 10, bullet = 10, laser = 10, energy = 10, bomb = 10, bio = 10, rad = 50) + offline_slowdown = 1 + online_slowdown = RIG_LIGHT chest_type = /obj/item/clothing/suit/space/rig/emergency helm_type = /obj/item/clothing/head/helmet/space/rig/emergency @@ -48,7 +43,9 @@ initial_modules = list( /obj/item/rig_module/healthbar, - /obj/item/rig_module/maneuvering_jets + /obj/item/rig_module/storage/light, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination ) /obj/item/clothing/suit/space/rig/emergency @@ -63,6 +60,15 @@ /obj/item/clothing/head/helmet/space/rig/emergency name = "helmet" +/obj/item/rig/emergency/astro + name = "Astronaut RIG" + desc = "A light, emergency rig for use by non-qualified personnel in the case of emergency decompression." + icon_state = "ds_astro_rig" + + helm_type = /obj/item/clothing/head/helmet/space/rig/emergency/astro +/obj/item/clothing/head/helmet/space/rig/emergency/astro + light_overlay = "ds_astro_rig_light" + /obj/item/rig/clown name = "Clown RIG" desc = "Honk honk." diff --git a/code/modules/clothing/spacesuits/rig/suits/cseco.dm b/code/modules/clothing/spacesuits/rig/suits/cseco.dm index 4daa87fc713..45c49edb9f2 100644 --- a/code/modules/clothing/spacesuits/rig/suits/cseco.dm +++ b/code/modules/clothing/spacesuits/rig/suits/cseco.dm @@ -1,42 +1,44 @@ -/obj/item/rig/cseco - name = "P-Sec Commander RIG" - desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments. This instance was designed specially for CSECO." - icon_state = "pcsi_riot_rig" - armor = list(melee = 70, bullet = 67, laser = 60, energy = 30, bomb = 75, bio = 100, rad = 60) - online_slowdown = RIG_MEDIUM - acid_resistance = 2 //Contains a fair bit of plastic - allowed = list(/obj/item/shield/riot) - - chest_type = /obj/item/clothing/suit/space/rig/cseco - helm_type = /obj/item/clothing/head/helmet/space/rig/cseco - boot_type = /obj/item/clothing/shoes/magboots/rig/cseco - glove_type = /obj/item/clothing/gloves/rig/cseco - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage/heavy, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork - /obj/item/rig_module/device/pen, - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/nvgsec - ) - -/obj/item/rig/cseco/Initialize() - . = ..() - if(istype(GLOB.using_map, /datum/map/ishimura)) - name = "P.C.S.I Commander RIG" - -/obj/item/clothing/suit/space/rig/cseco - name = "armor" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/cseco - name = "gauntlets" - -/obj/item/clothing/shoes/magboots/rig/cseco - name = "boots" - -/obj/item/clothing/head/helmet/space/rig/cseco - name = "helmet" +/obj/item/rig/cseco + name = "P-Sec Commander RIG" + desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments. This instance was designed specially for CSECO." + icon_state = "pcsi_riot_rig" + armor = list(melee = 70, bullet = 67, laser = 60, energy = 30, bomb = 75, bio = 100, rad = 60) + online_slowdown = RIG_MEDIUM + acid_resistance = 2 //Contains a fair bit of plastic + allowed = list(/obj/item/shield/riot) + + chest_type = /obj/item/clothing/suit/space/rig/cseco + helm_type = /obj/item/clothing/head/helmet/space/rig/cseco + boot_type = /obj/item/clothing/shoes/magboots/rig/cseco + glove_type = /obj/item/clothing/gloves/rig/cseco + + initial_modules = list( + /obj/item/rig_module/healthbar, + /obj/item/rig_module/storage/heavy, + /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination + /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork + /obj/item/rig_module/device/pen, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/nvgsec + ) + +/obj/item/rig/cseco/Initialize() + . = ..() + if(istype(GLOB.using_map, /datum/map/ishimura)) + name = "P.C.S.I Commander RIG" + +/obj/item/clothing/suit/space/rig/cseco + name = "armor" + valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) + restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) + +/obj/item/clothing/gloves/rig/cseco + name = "insulated gauntlets" + desc = "These gloves will protect the wearer from electric shocks." + siemens_coefficient = 0 + +/obj/item/clothing/shoes/magboots/rig/cseco + name = "boots" + +/obj/item/clothing/head/helmet/space/rig/cseco + name = "helmet" diff --git a/code/modules/clothing/spacesuits/rig/suits/engineering.dm b/code/modules/clothing/spacesuits/rig/suits/engineering.dm index b4165dcc456..43c7d390fcb 100644 --- a/code/modules/clothing/spacesuits/rig/suits/engineering.dm +++ b/code/modules/clothing/spacesuits/rig/suits/engineering.dm @@ -1,10 +1,10 @@ /obj/item/rig/engineering - name = "Engineering RIG" - desc = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering." + name = "Standard Engineering RIG" + desc = "the most basic form of Resource Integration Gear available for engineers throughout the course of their employment." icon_state = "ds_engineering_rig" - armor = list(melee = 45, bullet = 50, laser = 50, energy = 25, bomb = 60, bio = 100, rad = 75) + armor = list(melee = 45, bullet = 45, laser = 45, energy = 25, bomb = 60, bio = 100, rad = 75) offline_slowdown = 4 - online_slowdown = RIG_HEAVY + online_slowdown = RIG_MEDIUM acid_resistance = 2 //Contains a fair bit of plastic chest_type = /obj/item/clothing/suit/space/rig/engineering @@ -38,15 +38,73 @@ name = "helmet" /obj/item/rig/engineering/forged - name = "Forged Engineering RIG" + name = "Standard Forged Engineering RIG" icon_state = "forged_rig" - chest_type = /obj/item/clothing/suit/space/rig/engineering/forged - helm_type = /obj/item/clothing/head/helmet/space/rig/engineering/forged - boot_type = /obj/item/clothing/shoes/magboots/rig/engineering/forged - glove_type = /obj/item/clothing/gloves/rig/engineering/forged +/obj/item/rig/engineering/forged_new + name = "Standard Forged Engineering RIG" + icon_state = "engineer_standard_forged_rig" -/obj/item/clothing/suit/space/rig/engineering/forged -/obj/item/clothing/gloves/rig/engineering/forged -/obj/item/clothing/shoes/magboots/rig/engineering/forged -/obj/item/clothing/head/helmet/space/rig/engineering/forged \ No newline at end of file + +/// int + + + +/obj/item/rig/intermediate + name = "Intermediate Engineering RIG" + desc = "A intermediate engineering suit, issued to class 2 engineers; designed for shipboard engineering." + icon_state = "engineer_intermediate_rig" + armor = list(melee = 53.25, bullet = 53.75, laser = 53.75, energy = 27.5, bomb = 67.5, bio = 100, rad = 85) + online_slowdown = RIG_FLEXIBLE + acid_resistance = 2.5 + + chest_type = /obj/item/clothing/suit/space/rig/intermediate + helm_type = /obj/item/clothing/head/helmet/space/rig/intermediate + boot_type = /obj/item/clothing/shoes/magboots/rig/intermediate + glove_type = /obj/item/clothing/gloves/rig/intermediate + + initial_modules = list( + /obj/item/rig_module/healthbar, + /obj/item/rig_module/storage, + /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/meson, + /obj/item/rig_module/kinesis, + /obj/item/rig_module/hotswap, + /obj/item/rig_module/power_sink + ) + +/obj/item/clothing/suit/space/rig/intermediate + name = "suit" + +/obj/item/clothing/gloves/rig/intermediate + name = "insulated gloves" + desc = "These gloves will protect the wearer from electric shocks." + siemens_coefficient = 0 + +/obj/item/clothing/shoes/magboots/rig/intermediate + name = "shoes" + +/obj/item/clothing/head/helmet/space/rig/intermediate + name = "helmet" + +/obj/item/rig/intermediate/forged + name = "Intermediate Forged Engineering RIG" + icon_state = "engineer_intermediate_forged_rig" + +/obj/item/rig/intermediate/survivor + name = "Intermediate Survivor Engineering RIG" + icon_state = "intermediate_engineer_survivor_rig" + +// adv + + +/obj/item/rig/advanced/engineering + name = "Advanced Engineering RIG" + desc = "Exclusive only to upper class engineers who have passed rigorous training and performed multiple repairs in hostile environments." + icon_state = "advanced_engineer_rig" + +/obj/item/rig/advanced/forged + name = "Forged Advanced Engineering RIG" + desc = "Exclusive only to upper class engineers who have passed rigorous training and performed multiple repairs in hostile environments." + icon_state = "engineer_advanced_forged_rig" diff --git a/code/modules/clothing/spacesuits/rig/suits/excavation.dm b/code/modules/clothing/spacesuits/rig/suits/excavation.dm deleted file mode 100644 index 58c7d47d907..00000000000 --- a/code/modules/clothing/spacesuits/rig/suits/excavation.dm +++ /dev/null @@ -1,31 +0,0 @@ -/obj/item/rig/excavation - name = "Excavation RIG" - desc = "A modified, lightweight version of the engineering suit. Perfect for quick operations." - icon_state = "excavation_rig" - armor = list(melee = 44, bullet = 44, laser = 40, energy = 15, bomb = 60, bio = 100, rad = 50) - online_slowdown = RIG_FLEXIBLE - - chest_type = /obj/item/clothing/suit/space/rig/excavation - helm_type = /obj/item/clothing/head/helmet/space/rig/excavation - boot_type = /obj/item/clothing/shoes/magboots/rig/excavation - glove_type = /obj/item/clothing/gloves/rig/excavation - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage/light, - /obj/item/rig_module/device/orescanner, - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/meson, - ) - -/obj/item/clothing/suit/space/rig/excavation - name = "suit" - -/obj/item/clothing/gloves/rig/excavation - name = "gloves" - -/obj/item/clothing/shoes/magboots/rig/excavation - name = "shoes" - -/obj/item/clothing/head/helmet/space/rig/excavation - name = "hood" diff --git a/code/modules/clothing/spacesuits/rig/suits/flesh.dm b/code/modules/clothing/spacesuits/rig/suits/flesh.dm deleted file mode 100644 index 919f7341970..00000000000 --- a/code/modules/clothing/spacesuits/rig/suits/flesh.dm +++ /dev/null @@ -1,19 +0,0 @@ -// Patreon rig - -/obj/item/rig/zealot/flesh - name = "Bloated RIG" - desc = "A horrifying amalgamation of flesh and a sparse amount of mechanical components, loosely resembling a rig." - icon_state = "flesh" - - chest_type = /obj/item/clothing/suit/space/rig/zealot/flesh - helm_type = /obj/item/clothing/head/helmet/space/rig/zealot/flesh - boot_type = /obj/item/clothing/shoes/magboots/rig/zealot/flesh - glove_type = /obj/item/clothing/gloves/rig/zealot/flesh - -/obj/item/clothing/head/helmet/space/rig/zealot/flesh - -/obj/item/clothing/suit/space/rig/zealot/flesh - -/obj/item/clothing/gloves/rig/zealot/flesh - -/obj/item/clothing/shoes/magboots/rig/zealot/flesh \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/suits/marksman.dm b/code/modules/clothing/spacesuits/rig/suits/marksman.dm index 78a7793fbc4..a7197305d29 100644 --- a/code/modules/clothing/spacesuits/rig/suits/marksman.dm +++ b/code/modules/clothing/spacesuits/rig/suits/marksman.dm @@ -36,4 +36,9 @@ /obj/item/clothing/head/helmet/space/rig/marksman name = "helmet" - light_overlay = "wasp_light" \ No newline at end of file + light_overlay = "wasp_light" + +/obj/item/rig/marksman/wasp + name = "Wasp RIG" + desc = "A lightweight and flexible armoured rig suit." + icon_state = "wasp_rig" \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/suits/mining.dm b/code/modules/clothing/spacesuits/rig/suits/mining.dm index ba94d8c5063..04d3190fc60 100644 --- a/code/modules/clothing/spacesuits/rig/suits/mining.dm +++ b/code/modules/clothing/spacesuits/rig/suits/mining.dm @@ -1,9 +1,10 @@ /obj/item/rig/mining - name = "Hazard Mining RIG" - desc = "A cheaper version of the engineering suit. Commonly used during planet cracking operations." + name = "Standard Mining RIG" + desc = "A standard issued mining suit, issued to class 1 miners; Commonly used during planet cracking operations." icon_state = "ds_mining_rig" armor = list(melee = 43.5, bullet = 42.5, laser = 42.5, energy = 15, bomb = 70, bio = 100, rad = 50) - online_slowdown = RIG_HEAVY + online_slowdown = RIG_MEDIUM + acid_resistance = 2 chest_type = /obj/item/clothing/suit/space/rig/mining helm_type = /obj/item/clothing/head/helmet/space/rig/mining @@ -29,3 +30,53 @@ /obj/item/clothing/head/helmet/space/rig/mining name = "hood" + +/obj/item/rig/excavation + name = "Intermediate Mining RIG" + desc = "Exclusive only to class 2 miners and is a standard equipment when working in hostile environments or during a hazardous mining operation." + icon_state = "excavation_rig" + armor = list(melee = 51.75, bullet = 51.25, laser = 51.25, energy = 22.5, bomb = 67.5, bio = 100, rad = 72.5) + online_slowdown = RIG_FLEXIBLE + acid_resistance = 2.5 + + chest_type = /obj/item/clothing/suit/space/rig/excavation + helm_type = /obj/item/clothing/head/helmet/space/rig/excavation + boot_type = /obj/item/clothing/shoes/magboots/rig/excavation + glove_type = /obj/item/clothing/gloves/rig/excavation + + initial_modules = list( + /obj/item/rig_module/healthbar, + /obj/item/rig_module/storage, + /obj/item/rig_module/device/orescanner, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/meson, + ) + +/obj/item/clothing/suit/space/rig/excavation + name = "suit" + +/obj/item/clothing/gloves/rig/excavation + name = "gloves" + +/obj/item/clothing/shoes/magboots/rig/excavation + name = "shoes" + +/obj/item/clothing/head/helmet/space/rig/excavation + name = "hood" + +/obj/item/rig/advanced/mining + name = "Advanced Mining RIG" + desc = "The latest in cutting-edge RIG technology. Lightweight, tough, and packed with utilities" + icon_state = "advanced_miner_rig" + + initial_modules = list( + /obj/item/rig_module/healthbar/advanced, + /obj/item/rig_module/storage/heavy, + /obj/item/rig_module/grenade_launcher/light, + /obj/item/rig_module/device/orescanner, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/meson, + /obj/item/rig_module/kinesis/advanced, + /obj/item/rig_module/hotswap, + /obj/item/rig_module/power_sink + ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/suits/patrol.dm b/code/modules/clothing/spacesuits/rig/suits/patrol.dm deleted file mode 100644 index d50ad56aec0..00000000000 --- a/code/modules/clothing/spacesuits/rig/suits/patrol.dm +++ /dev/null @@ -1,41 +0,0 @@ - -/obj/item/rig/patrol - name = "Patrol RIG" - desc = "A very lightweight yet reasonably armoured suit, designed for long journeys on foot." - icon_state = "patrol" - armor = list(melee = 54.5, bullet = 54.5, laser = 60, energy = 25, bomb = 50, bio = 100, rad = 60) - online_slowdown = RIG_FLEXIBLE - - chest_type = /obj/item/clothing/suit/space/rig/patrol - helm_type = /obj/item/clothing/head/helmet/space/rig/patrol - boot_type = /obj/item/clothing/shoes/magboots/rig/patrol - glove_type = /obj/item/clothing/gloves/rig/patrol - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage/heavy, - /obj/item/rig_module/maneuvering_jets, - ) - - /* - Far Future TODO - Give patrol rig better cold resistance, making it good for wilderness survival on tau volantis - - */ - -/obj/item/clothing/suit/space/rig/patrol - name = "suit" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/patrol - name = "gloves" - -/obj/item/clothing/shoes/magboots/rig/patrol - name = "boots" - -/obj/item/clothing/head/helmet/space/rig/patrol - name = "helmet" - - - diff --git a/code/modules/clothing/spacesuits/rig/suits/riot.dm b/code/modules/clothing/spacesuits/rig/suits/riot.dm deleted file mode 100644 index 70a11974053..00000000000 --- a/code/modules/clothing/spacesuits/rig/suits/riot.dm +++ /dev/null @@ -1,37 +0,0 @@ -/obj/item/rig/riot - name = "Riot RIG" - desc = "A heavy duty and armoured rig suit, designed for riot control and shipboard disciplinary enforcement. This suit is commonly found among security officers on the Sprawl, and in lesser capacity on private ships and stations." - icon_state = "ds_riot_rig" - armor = list(melee = 65, bullet = 60, laser = 55, energy = 30, bomb = 65, bio = 100, rad = 60) - online_slowdown = RIG_VERY_HEAVY - acid_resistance = 2 //Contains a fair bit of plastic - allowed = list(/obj/item/shield/riot) - - chest_type = /obj/item/clothing/suit/space/rig/riot - helm_type = /obj/item/clothing/head/helmet/space/rig/riot - boot_type = /obj/item/clothing/shoes/magboots/rig/riot - glove_type = /obj/item/clothing/gloves/rig/riot - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage/heavy, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork - /obj/item/rig_module/device/pen, - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/nvgsec - ) - -/obj/item/clothing/suit/space/rig/riot - name = "armor" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/riot - name = "gauntlets" - -/obj/item/clothing/shoes/magboots/rig/riot - name = "boots" - -/obj/item/clothing/head/helmet/space/rig/riot - name = "helmet" diff --git a/code/modules/clothing/spacesuits/rig/suits/scaf.dm b/code/modules/clothing/spacesuits/rig/suits/scaf.dm index ef2d12cad7d..9bfe1d9979f 100644 --- a/code/modules/clothing/spacesuits/rig/suits/scaf.dm +++ b/code/modules/clothing/spacesuits/rig/suits/scaf.dm @@ -2,64 +2,23 @@ // - These are not intended to go anywhere but the store. Do not add them to random lists. - Snype //SCAF Elite RIG -/obj/item/rig/scaf +/obj/item/rig/pcsi/scaf name = "Refurbished SCAF RIG" desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement." icon_state = "scaf_elite_rig" - //Security RIG stats - armor = list(melee = 57.5, bullet = 65, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60) - - online_slowdown = RIG_MEDIUM - acid_resistance = 1.75 //Contains a fair bit of plastic - - chest_type = /obj/item/clothing/suit/space/rig/scaf - helm_type = /obj/item/clothing/head/helmet/space/rig/scaf - boot_type = /obj/item/clothing/shoes/magboots/rig/scaf - glove_type = /obj/item/clothing/gloves/rig/scaf - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage, - /obj/item/rig_module/grenade_launcher/light //These grenades are harmless illumination - ) - -//These pieces don't need redefined for every sub-rig, their values are set procedurally from the frame -/obj/item/clothing/head/helmet/space/rig/scaf - -/obj/item/clothing/suit/space/rig/scaf - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/scaf - -/obj/item/clothing/shoes/magboots/rig/scaf - -/obj/item/rig/scaf/elite +/obj/item/rig/pcsi/elite name = "elite SCAF RIG" icon_state = "scaf_elite_rig" - //SCAF Legionnaire RIG -/obj/item/rig/scaf/legionnaire +/obj/item/rig/pcsi/legionnaire name = "Refurbished SCAF Expeditionary RIG" desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement." icon_state = "scaf_legionnaire_rig" - online_slowdown = RIG_MEDIUM - acid_resistance = 1.75 //Contains a fair bit of plastic - //SCAF Sharpshooter RIG -/obj/item/rig/scaf/sharpshooter +/obj/item/rig/pcsi/sharpshooter name = "Refurbished SCAF Sharpshooter RIG" desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement." icon_state = "scaf_sharpshooter_rig" - online_slowdown = RIG_MEDIUM - acid_resistance = 1.75 //Contains a fair bit of plastic - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/vision/nvgsec //Unique advantage of the Sharpshooter rig vs its counterparts. - ) diff --git a/code/modules/clothing/spacesuits/rig/suits/sea.dm b/code/modules/clothing/spacesuits/rig/suits/sea.dm deleted file mode 100644 index 821341b9969..00000000000 --- a/code/modules/clothing/spacesuits/rig/suits/sea.dm +++ /dev/null @@ -1,83 +0,0 @@ -// Patreon rig - -/obj/item/rig/vintage/sea - name = "Hazard Diving RIG" - desc = "The heavy-duty hazard diving RIG is the standard among CEC deep sea mining operations. It's plating has been reinforced to withstand extreme undersea pressures and concussive forces." - icon_state = "heavy_diving_rig" - - chest_type = /obj/item/clothing/suit/space/rig/sea - helm_type = /obj/item/clothing/head/helmet/space/rig/sea - boot_type = /obj/item/clothing/shoes/magboots/rig/sea - glove_type = /obj/item/clothing/gloves/rig/sea - -/obj/item/clothing/head/helmet/space/rig/sea - name = "helmet" - -/obj/item/clothing/suit/space/rig/sea - name = "suit" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/sea - name = "insulated gloves" - desc = "These gloves will protect the wearer from electric shocks." - siemens_coefficient = 0 - -/obj/item/clothing/shoes/magboots/rig/vintage/heavy - name = "boots" - -// Patreon rig - -/obj/item/rig/advanced/dad - name = "Elite Diving RIG" - desc = "The elite diving RIG is the next generation of diving RIGs used among CEC deep sea mining operations. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility." - icon_state = "elite_diving_rig" - - chest_type = /obj/item/clothing/suit/space/rig/sea/dad - helm_type = /obj/item/clothing/head/helmet/space/rig/sea/dad - boot_type = /obj/item/clothing/shoes/magboots/rig/sea/dad - glove_type = /obj/item/clothing/gloves/rig/sea/dad - -/obj/item/clothing/head/helmet/space/rig/sea/dad - name = "helmet" - -/obj/item/clothing/suit/space/rig/sea/dad - name = "suit" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/sea/dad - name = "insulated gloves" - desc = "These gloves will protect the wearer from electric shocks." - siemens_coefficient = 0 - -/obj/item/clothing/shoes/magboots/rig/sea/dad - name = "boots" - -// Patreon rig - -/obj/item/rig/advanced/sister - name = "Strange Diving RIG" - desc = "a strange diving RIG with a cage on the shoulder and symbols drawn upon the suit. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility." - icon_state = "sister_rig" - - chest_type = /obj/item/clothing/suit/space/rig/sea/sister - helm_type = /obj/item/clothing/head/helmet/space/rig/sea/sister - boot_type = /obj/item/clothing/shoes/magboots/rig/sea/sister - glove_type = /obj/item/clothing/gloves/rig/sea/sister - -/obj/item/clothing/head/helmet/space/rig/sea/sister - name = "helmet" - -/obj/item/clothing/suit/space/rig/sea/sister - name = "suit" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/sea/sister - name = "insulated gloves" - desc = "These gloves will protect the wearer from electric shocks." - siemens_coefficient = 0 - -/obj/item/clothing/shoes/magboots/rig/sea/sister - name = "boots" \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/suits/security.dm b/code/modules/clothing/spacesuits/rig/suits/security.dm index 0ad403e8347..bbf7f58f9a9 100644 --- a/code/modules/clothing/spacesuits/rig/suits/security.dm +++ b/code/modules/clothing/spacesuits/rig/suits/security.dm @@ -1,152 +1,102 @@ -//Ishimura Sec RIGs -//PCSI RIG -/obj/item/rig/security/pcsi - name = "PCSI RIG" - desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments." - icon_state = "pcsi_rig" - armor = list(melee = 60, bullet = 64, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60) - online_slowdown = RIG_MEDIUM - acid_resistance = 1.75 //Contains a fair bit of plastic - - chest_type = /obj/item/clothing/suit/space/rig/security/pcsi - helm_type = /obj/item/clothing/head/helmet/space/rig/security/pcsi - boot_type = /obj/item/clothing/shoes/magboots/rig/security/pcsi - glove_type = /obj/item/clothing/gloves/rig/security/pcsi - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork - /obj/item/rig_module/device/pen, - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/nvgsec - ) - -/obj/item/clothing/head/helmet/space/rig/security/pcsi - -/obj/item/clothing/suit/space/rig/security/pcsi - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/shoes/magboots/rig/security/pcsi - -/obj/item/clothing/gloves/rig/security/pcsi - -//PCSI Patreon RIGs -/obj/item/rig/security/pcsi/ruined - name = "PCSI Survivor RIG" - desc = "The RIG remains battered and beaten, dented and missing pieces. The blood remains permanently rusted to the frame. The will of the survivor remains unbroken." - icon_state = "pcsi_rig_ruined" - - chest_type = /obj/item/clothing/suit/space/rig/security/pcsi/ruined - helm_type = /obj/item/clothing/head/helmet/space/rig/security/pcsi/ruined - boot_type = /obj/item/clothing/shoes/magboots/rig/security/pcsi/ruined - glove_type = /obj/item/clothing/gloves/rig/security/pcsi/ruined - -/obj/item/clothing/head/helmet/space/rig/security/pcsi/ruined - -/obj/item/clothing/suit/space/rig/security/pcsi/ruined - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/shoes/magboots/rig/security/pcsi/ruined - -/obj/item/clothing/gloves/rig/security/pcsi/ruined - - -/obj/item/rig/security/pcsi/carver - name = "Spec Ops RIG" - desc = "A heavily armoured rig suit, designed for military use. Especially effective against bullets." - icon_state = "carver_rig" - - chest_type = /obj/item/clothing/suit/space/rig/carver - helm_type = /obj/item/clothing/head/helmet/space/rig/carver - boot_type = /obj/item/clothing/shoes/magboots/rig/carver - glove_type = /obj/item/clothing/gloves/rig/carver - -/obj/item/clothing/suit/space/rig/carver - name = "suit" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/carver - name = "gloves" - -/obj/item/clothing/shoes/magboots/rig/carver - name = "boots" - -/obj/item/clothing/head/helmet/space/rig/carver - name = "helmet" - light_overlay = "carver_light" - - -//PCSI Riot RIG -/obj/item/rig/security/pcsi/advanced - name = "PCSI Riot RIG" - desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments." - icon_state = "pcsi_riot_rig" - armor = list(melee = 62, bullet = 56, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60) - online_slowdown = RIG_MEDIUM - acid_resistance = 1.75 //Contains a fair bit of plastic - - chest_type = /obj/item/clothing/suit/space/rig/security/pcsi/advanced - helm_type = /obj/item/clothing/head/helmet/space/rig/security/pcsi/advanced - boot_type = /obj/item/clothing/shoes/magboots/rig/security/pcsi/advanced - glove_type = /obj/item/clothing/gloves/rig/security/pcsi/advanced - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork - /obj/item/rig_module/device/pen, - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/nvgsec - ) - -/obj/item/clothing/head/helmet/space/rig/security/pcsi/advanced - -/obj/item/clothing/suit/space/rig/security/pcsi/advanced - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/shoes/magboots/rig/security/pcsi/advanced - -/obj/item/clothing/gloves/rig/security/pcsi/advanced - - -//Sprawl Sec RIGs -//Titan Security RIG -/obj/item/rig/security - name = "Security RIG" - desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement." - icon_state = "ds_security_rig" - armor = list(melee = 56.5, bullet = 60, laser = 60, energy = 25, bomb = 60, bio = 100, rad = 60) - online_slowdown = RIG_MEDIUM - acid_resistance = 1.75 //Contains a fair bit of plastic - - chest_type = /obj/item/clothing/suit/space/rig/security - helm_type = /obj/item/clothing/head/helmet/space/rig/security - boot_type = /obj/item/clothing/shoes/magboots/rig/security - glove_type = /obj/item/clothing/gloves/rig/security - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork - /obj/item/rig_module/device/pen, - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/nvgsec - ) - -/obj/item/clothing/head/helmet/space/rig/security - -/obj/item/clothing/suit/space/rig/security - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/security - -/obj/item/clothing/shoes/magboots/rig/security +//Ishimura Sec RIGs +//PCSI RIG +/obj/item/rig/pcsi + name = "PCSI RIG" + desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments." + icon_state = "pcsi_rig" + armor = list(melee = 60, bullet = 64, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60) + online_slowdown = RIG_MEDIUM + acid_resistance = 1.75 //Contains a fair bit of plastic + + chest_type = /obj/item/clothing/suit/space/rig/pcsi + helm_type = /obj/item/clothing/head/helmet/space/rig/pcsi + boot_type = /obj/item/clothing/shoes/magboots/rig/pcsi + glove_type = /obj/item/clothing/gloves/rig/pcsi + + initial_modules = list( + /obj/item/rig_module/healthbar, + /obj/item/rig_module/storage, + /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination + /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork + /obj/item/rig_module/device/pen, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/nvgsec + ) + +/obj/item/clothing/head/helmet/space/rig/pcsi + +/obj/item/clothing/suit/space/rig/pcsi + valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) + restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) + +/obj/item/clothing/shoes/magboots/rig/pcsi + +/obj/item/clothing/gloves/rig/pcsi + +//Titan Security RIG +/obj/item/rig/pcsi/security + name = "Security RIG" + desc = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement." + icon_state = "ds_security_rig" + +//PCSI Patreon RIGs +/obj/item/rig/pcsi/ruined + name = "PCSI Survivor RIG" + desc = "The RIG remains battered and beaten, dented and missing pieces. The blood remains permanently rusted to the frame. The will of the survivor remains unbroken." + icon_state = "pcsi_rig_ruined" + +/obj/item/rig/pcsi/carver + name = "Spec Ops RIG" + desc = "A heavily armoured rig suit, designed for military use. Especially effective against bullets." + icon_state = "carver_rig" + + helm_type = /obj/item/clothing/head/helmet/space/rig/carver + +/obj/item/clothing/head/helmet/space/rig/carver + name = "helmet" + light_overlay = "carver_light" + +//PCSI Riot RIG +/obj/item/rig/riot + name = "Riot RIG" + desc = "A lightweight and flexible armoured rig suit used by CEC shipboard security during crackdowns and for use in hazardous environments." + icon_state = "ds_riot_rig" + armor = list(melee = 65, bullet = 60, laser = 55, energy = 30, bomb = 65, bio = 100, rad = 60) + online_slowdown = RIG_MEDIUM + acid_resistance = 1.75 //Contains a fair bit of plastic + + chest_type = /obj/item/clothing/suit/space/rig/riot + helm_type = /obj/item/clothing/head/helmet/space/rig/riot + boot_type = /obj/item/clothing/shoes/magboots/rig/riot + glove_type = /obj/item/clothing/gloves/rig/riot + + initial_modules = list( + /obj/item/rig_module/healthbar, + /obj/item/rig_module/storage, + /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination + /obj/item/rig_module/device/paperdispenser, //For warrants and paperwork + /obj/item/rig_module/device/pen, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/nvgsec + ) + +/obj/item/clothing/suit/space/rig/riot + name = "suit" + valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) + restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) + +/obj/item/clothing/gloves/rig/riot + name = "gloves" + +/obj/item/clothing/shoes/magboots/rig/riot + name = "boots" + +/obj/item/clothing/head/helmet/space/rig/riot + name = "helmet" + +//PCSI Patrol RIG +/obj/item/rig/riot/patrol + name = "Patrol RIG" + desc = "A very lightweight yet reasonably armoured suit, designed for long journeys on foot." + icon_state = "patrol" + armor = list(melee = 60, bullet = 65, laser = 55, energy = 30, bomb = 65, bio = 100, rad = 60) diff --git a/code/modules/clothing/spacesuits/rig/suits/tarnished.dm b/code/modules/clothing/spacesuits/rig/suits/tarnished.dm deleted file mode 100644 index c816cf4bf50..00000000000 --- a/code/modules/clothing/spacesuits/rig/suits/tarnished.dm +++ /dev/null @@ -1,19 +0,0 @@ - -//patreon rig -/obj/item/rig/advanced/tarnished - name = "Tarnished RIG" - desc = "A rig made from the reforged armor of his family that was passed from generation to generations for decades." - icon_state = "tarnished" - - chest_type = /obj/item/clothing/suit/space/rig/tarnished - helm_type = /obj/item/clothing/head/helmet/space/rig/tarnished - boot_type = /obj/item/clothing/shoes/magboots/rig/tarnished - glove_type = /obj/item/clothing/gloves/rig/tarnished - -/obj/item/clothing/head/helmet/space/rig/tarnished - -/obj/item/clothing/suit/space/rig/tarnished - -/obj/item/clothing/gloves/rig/tarnished - -/obj/item/clothing/shoes/magboots/rig/tarnished diff --git a/code/modules/clothing/spacesuits/rig/suits/unitologist.dm b/code/modules/clothing/spacesuits/rig/suits/unitologist.dm index 7e6b61b3ecd..f40ea40f15d 100644 --- a/code/modules/clothing/spacesuits/rig/suits/unitologist.dm +++ b/code/modules/clothing/spacesuits/rig/suits/unitologist.dm @@ -1,30 +1,36 @@ -/obj/item/rig/zealot - name = "Zealot RIG" - desc = "An old combat RIG used by SCAF over two hundred years ago. The armour has seen some wear but still functions as it should, it has been repainted in black and crimson colours. There are unitologist markings across the suit." - icon_state = "zealot_rig" - armor = list(melee = 56, bullet = 60, laser = 30, energy = 20, bomb = 30, bio = 100, rad = 40) - online_slowdown = RIG_MEDIUM - acid_resistance = 1.75 //Contains a fair bit of plastic - - chest_type = /obj/item/clothing/suit/space/rig/zealot - helm_type = /obj/item/clothing/head/helmet/space/rig/zealot - boot_type = /obj/item/clothing/shoes/magboots/rig/zealot - glove_type = /obj/item/clothing/gloves/rig/zealot - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/vision/nvgsec - ) - -/obj/item/clothing/head/helmet/space/rig/zealot - light_overlay = "zealothelm_light" - -/obj/item/clothing/suit/space/rig/zealot - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/zealot - -/obj/item/clothing/shoes/magboots/rig/zealot +/obj/item/rig/zealot + name = "Zealot RIG" + desc = "An security rig, it has been repainted in black and crimson colours. There are unitologist markings across the suit." + icon_state = "zealot_rig" + armor = list(melee = 60, bullet = 64, laser = 60, energy = 0, bomb = 60, bio = 100, rad = 60) + online_slowdown = RIG_MEDIUM + acid_resistance = 1.75 //Contains a fair bit of plastic + + chest_type = /obj/item/clothing/suit/space/rig/zealot + helm_type = /obj/item/clothing/head/helmet/space/rig/zealot + boot_type = /obj/item/clothing/shoes/magboots/rig/zealot + glove_type = /obj/item/clothing/gloves/rig/zealot + + initial_modules = list( + /obj/item/rig_module/healthbar, + /obj/item/rig_module/storage, + /obj/item/rig_module/grenade_launcher/military, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/nvgsec + ) + +/obj/item/clothing/head/helmet/space/rig/zealot + light_overlay = "zealothelm_light" + +/obj/item/clothing/suit/space/rig/zealot + valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) + restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) + +/obj/item/clothing/gloves/rig/zealot + +/obj/item/clothing/shoes/magboots/rig/zealot +/obj/item/rig/zealot/flesh + name = "Bloated RIG" + desc = "A horrifying amalgamation of flesh and a sparse amount of mechanical components, loosely resembling a rig." + icon_state = "flesh" + diff --git a/code/modules/clothing/spacesuits/rig/suits/vintage.dm b/code/modules/clothing/spacesuits/rig/suits/vintage.dm index 0b57fb23b89..f8df618b1fc 100644 --- a/code/modules/clothing/spacesuits/rig/suits/vintage.dm +++ b/code/modules/clothing/spacesuits/rig/suits/vintage.dm @@ -1,65 +1,49 @@ -/obj/item/rig/vintage - name = "Antique CEC RIG" - desc = "An extremely bulky, durable vintage suit that has mostly been replaced by sleeker modern designs. Some collectors still value the good old days though." - icon_state = "vintage_rig" - armor = list(melee = 66.5, bullet = 70, laser = 57.5, energy = 25, bomb = 90, bio = 100, rad = 70) - offline_slowdown = 5 - online_slowdown = RIG_SUPER_HEAVY - - max_health = 4000 - - chest_type = /obj/item/clothing/suit/space/rig/vintage - helm_type = /obj/item/clothing/head/helmet/space/rig/vintage - boot_type = /obj/item/clothing/shoes/magboots/rig/vintage - glove_type = /obj/item/clothing/gloves/rig/vintage - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage/heavy, - /obj/item/rig_module/device/orescanner, - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/vision/meson - ) - -/obj/item/clothing/suit/space/rig/vintage - name = "suit" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/head/helmet/space/rig/vintage - name = "helmet" - -/obj/item/clothing/gloves/rig/vintage - name = "insulated gloves" - desc = "These gloves will protect the wearer from electric shocks." - siemens_coefficient = 0 - -/obj/item/clothing/shoes/magboots/rig/vintage - name = "boots" - - -/obj/item/rig/vintage/heavy - name = "Antique Heavy-Duty CEC RIG" - desc = "The heavy-duty vintage CEC RIG is used in the most hazardous engineering operations aboard CEC vessels. Its heavier armor plating can withstand more blunt damage than most CEC suits, and can withstand radiation just as well. As working conditions on CEC ships have improved, this RIG has been discontinued, but some heavy variants can still be found on old planet crackers." - icon_state = "vintage_suit" - - chest_type = /obj/item/clothing/suit/space/rig/vintage/heavy - helm_type = /obj/item/clothing/head/helmet/space/rig/vintage/heavy - boot_type = /obj/item/clothing/shoes/magboots/rig/vintage/heavy - glove_type = /obj/item/clothing/gloves/rig/vintage/heavy - -/obj/item/clothing/head/helmet/space/rig/vintage/heavy - name = "helmet" - -/obj/item/clothing/suit/space/rig/vintage/heavy - name = "suit" - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) - restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) - -/obj/item/clothing/gloves/rig/vintage/heavy - name = "insulated gloves" - desc = "These gloves will protect the wearer from electric shocks." - siemens_coefficient = 0 - -/obj/item/clothing/shoes/magboots/rig/vintage/heavy - name = "boots" +/obj/item/rig/vintage + name = "Antique CEC RIG" + desc = "An extremely bulky, durable vintage suit that has mostly been replaced by sleeker modern designs. Some collectors still value the good old days though." + icon_state = "vintage_rig" + armor = list(melee = 66.5, bullet = 70, laser = 57.5, energy = 25, bomb = 90, bio = 100, rad = 70) + offline_slowdown = RIG_VERY_HEAVY + online_slowdown = RIG_SUPER_HEAVY + + max_health = 4000 + + chest_type = /obj/item/clothing/suit/space/rig/vintage + helm_type = /obj/item/clothing/head/helmet/space/rig/vintage + boot_type = /obj/item/clothing/shoes/magboots/rig/vintage + glove_type = /obj/item/clothing/gloves/rig/vintage + + initial_modules = list( + /obj/item/rig_module/healthbar, + /obj/item/rig_module/storage/heavy, + /obj/item/rig_module/device/orescanner, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/meson + ) + +/obj/item/clothing/suit/space/rig/vintage + name = "suit" + valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) + restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_S) + +/obj/item/clothing/head/helmet/space/rig/vintage + name = "helmet" + +/obj/item/clothing/gloves/rig/vintage + name = "insulated gloves" + desc = "These gloves will protect the wearer from electric shocks." + siemens_coefficient = 0 + +/obj/item/clothing/shoes/magboots/rig/vintage + name = "boots" + +/obj/item/rig/vintage/heavy + name = "Antique Heavy-Duty CEC RIG" + desc = "The heavy-duty vintage CEC RIG is used in the most hazardous engineering operations aboard CEC vessels. Its heavier armor plating can withstand more blunt damage than most CEC suits, and can withstand radiation just as well. As working conditions on CEC ships have improved, this RIG has been discontinued, but some heavy variants can still be found on old planet crackers." + icon_state = "vintage_suit" + +/obj/item/rig/vintage/sea + name = "Hazard Diving RIG" + desc = "The heavy-duty hazard diving RIG is the standard among CEC deep sea mining operations. It's plating has been reinforced to withstand extreme undersea pressures and concussive forces." + icon_state = "heavy_diving_rig" + diff --git a/code/modules/clothing/spacesuits/rig/suits/wasp.dm b/code/modules/clothing/spacesuits/rig/suits/wasp.dm deleted file mode 100644 index cd1b95c998f..00000000000 --- a/code/modules/clothing/spacesuits/rig/suits/wasp.dm +++ /dev/null @@ -1,38 +0,0 @@ -/obj/item/rig/wasp - name = "Wasp RIG" - desc = "A lightweight and flexible armoured rig suit, offers good protection against light impacts. Use kit on an Engineering RIG." - icon_state = "wasp_rig" - armor = list(melee = 47.5, bullet = 53, laser = 55, energy = 30, bomb = 65, bio = 100, rad = 80) - offline_slowdown = 4 - online_slowdown = RIG_MEDIUM - acid_resistance = 2 //Contains a fair bit of plastic - - chest_type = /obj/item/clothing/suit/space/rig/wasp - helm_type = /obj/item/clothing/head/helmet/space/rig/wasp - boot_type = /obj/item/clothing/shoes/magboots/rig/wasp - glove_type = /obj/item/clothing/gloves/rig/wasp - - initial_modules = list( - /obj/item/rig_module/healthbar, - /obj/item/rig_module/storage, - /obj/item/rig_module/grenade_launcher/light, //These grenades are harmless illumination - /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/kinesis, - /obj/item/rig_module/hotswap, - /obj/item/rig_module/power_sink - ) - -/obj/item/clothing/suit/space/rig/wasp - name = "suit" - -/obj/item/clothing/gloves/rig/wasp - name = "insulated gloves" - desc = "These gloves will protect the wearer from electric shocks." - siemens_coefficient = 0 - -/obj/item/clothing/shoes/magboots/rig/wasp - name = "boots" - -/obj/item/clothing/head/helmet/space/rig/wasp - name = "helmet" - light_overlay = "wasp_light" \ No newline at end of file diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 27629915adc..58769cac71a 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -282,7 +282,7 @@ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L) restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L) body_parts_covered = UPPER_TORSO|LOWER_TORSO - armor = list(melee = 42, bullet = 75, laser = 42, energy = 0, bomb = 25, bio = 0, rad = 0) + armor = list(melee = 33, bullet = 75, laser = 42, energy = 0, bomb = 25, bio = 0, rad = 0) siemens_coefficient = 0.7 starting_accessories = list(/obj/item/clothing/accessory/armguards/ballistic, /obj/item/clothing/accessory/legguards/ballistic) @@ -332,7 +332,7 @@ valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L) restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L) body_parts_covered = UPPER_TORSO|LOWER_TORSO - armor = list(melee = 50, bullet = 45, laser = 60, energy = 35, bomb = 30, bio = 10, rad = 0) + armor = list(melee = 54, bullet = 54, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0) siemens_coefficient = 0.5 starting_accessories = list(/obj/item/clothing/accessory/armguards/pcsi, /obj/item/clothing/accessory/legguards/pcsi) @@ -341,9 +341,9 @@ /obj/item/clothing/suit/armor/pcsi/cec name = "CEC standard vest" - desc = "The Concordance Extraction Corporation's standard issue vest, doesn't offer as much protection as a P.S.C.I officer's vest." + desc = "The Concordance Extraction Corporation's standard issue vest." icon_state = "cecvest" - armor = list(melee = 30, bullet = 15, laser = 30, energy = 20, bomb = 20, bio = 10, rad = 0) + armor = list(melee = 54, bullet = 54, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0) /* - Plan on using this for something later - Snype /obj/item/clothing/suit/armor/tactical diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 4a55bb6890d..4d6769fdd96 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -113,7 +113,7 @@ /obj/item/clothing/accessory/armguards/pcsi desc = "A pair of arm pads reinforced with armor plating. Attaches to a plate carrier." icon_state = "armguards_pcsi" - armor = list(melee = 30, bullet = 20, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0) + armor = list(melee = 54, bullet = 54, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0) /obj/item/clothing/accessory/armguards/merc name = "heavy arm guards" @@ -132,7 +132,7 @@ name = "ballistic arm guards" desc = "A pair of armored arm pads with heavy plates to protect against ballistic projectiles." icon_state = "armguards_ballistic" - armor = list(melee = 42, bullet = 75, laser = 42, energy = 0, bomb = 25, bio = 0, rad = 0) + armor = list(melee = 33, bullet = 75, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0) siemens_coefficient = 0.7 /obj/item/clothing/accessory/armguards/ablative @@ -182,7 +182,7 @@ /obj/item/clothing/accessory/legguards/pcsi desc = "A pair of armored leg pads. Attaches to a plate carrier." icon_state = "legguards_pcsi" - armor = list(melee = 30, bullet = 20, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0) + armor = list(melee = 54, bullet = 54, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0) /obj/item/clothing/accessory/legguards/merc name = "heavy leg guards" @@ -202,7 +202,7 @@ name = "ballistic leg guards" desc = "A pair of armored leg pads with heavy plates to protect against ballistic projectiles. Looks like they might impair movement." icon_state = "legguards_ballistic" - armor = list(melee = 42, bullet = 75, laser = 42, energy = 0, bomb = 25, bio = 0, rad = 0) + armor = list(melee = 33, bullet = 75, laser = 50, energy = 0, bomb = 25, bio = 0, rad = 0) siemens_coefficient = 0.7 slowdown = 1 diff --git a/code/modules/customitems/custom_item_types.dm b/code/modules/customitems/custom_item_types.dm index ae28495d185..7948f90c881 100644 --- a/code/modules/customitems/custom_item_types.dm +++ b/code/modules/customitems/custom_item_types.dm @@ -1,334 +1,395 @@ -//Unitology Ritual Blade -//Available to all patrons, loadout only -/datum/patron_item/uni_knife - name = "unitology ritual blade" - item_path = /obj/item/material/knife/unitologist - loadout_cost = 3 - loadout_access = ACCESS_PATRONS - description = "A pristine blade used for religious ceremonies in the Church of Unitology.\ - Mechanically, it has the same stats as an ordinary boot knife, but it has two important special features.
\ -
\ - 1. While held in hand, the blade unlocks the unique Sacrifice execution move, allowing ritual murder of a human without head protection.
\ - A human sacrificed in this manner is worth more biomass when the necromorphs get to them later.
\ - Requires the victim to remain still, so best restrain them first. The ritual takes wquite a while, giving you ample opportunity for a short speech
\ - Please note that simply owning this knife does not make you an antag, and you shouldn't be murdering humans if you aren't an antagonist.
\ -
\ - 2. While equipped, both in your loadout at roundstart, and your inventory during the round, this blade gives an extra 15% chance to be picked for unitology antagonist roles.
\ - This effect does not override your preferences, if you have unitologists set to never then you still won't be picked" - - -/* - Guns -*/ -/datum/patron_item/rivet - name = "711-MarkCL Rivet Gun" - id = "rivetgun" - item_path = /obj/item/gun/projectile/rivet - store_cost = 2400 - store_access = ACCESS_PATRONS - description = "The 711-MarkCL Rivet Gun is the latest refinement from Timson Tools' long line of friendly tools. Useful for rapid repairs at a distance!" - loadout_cost = 4 - loadout_access = ACCESS_PATRONS - - category = CATEGORY_TOOLS - subcategory = SUBCATEGORY_DANGEROUS_TOOLS - - -/* - RIG suits -*/ -/datum/patron_item/max_stone_rig - name = "Advanced Engineering RIG" - description = "The latest in cutting-edge RIG technology, uses the standard engineering suit scheme. It has `Parker R.` engraved next to the monitor lights." - item_path = /obj/item/rig/advanced/maxstone - id = "max_stone_rig" - store_cost = 15000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/advanced) - -//This is not my typo, his ckey is actually spelled like that -/datum/patron_item/plaugewalker - name = "SCAF Elite RIG" - description = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement." - item_path = /obj/item/rig/scaf/elite - id = "plaugewalker_rig" - store_cost = 10000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/security) - - -/datum/patron_item/banditofdoom - name = "Evangelion RIG" - description = "A project many months in the works, created by an obsessive historical anime fan. Even incorporates a custom voice changer for impersonating TV characters." - item_path = /obj/item/rig/advanced/banditofdoom - id = "banditofdoom_rig" - store_cost = 15000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 2 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/advanced) - - -/datum/patron_item/hacker_rig - name = "Digital Infiltration RIG" - item_path = /obj/item/rig/hacker - id = "hacker_rig" - - loadout_cost = 4 - loadout_access = ACCESS_PATRONS - - loadout_subtype = /datum/gear/RIG/frame - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - tags = list(LOADOUT_TAG_RIG) - exclusion_tags = list(LOADOUT_TAG_RIG) - equip_adjustments = OUTFIT_ADJUSTMENT_SKIP_BACKPACK - - -/datum/patron_item/mouse - name = "mouse" - item_path = /mob/living/simple_animal/mouse - id = "mouse" - store_cost = 1000 - store_access = ACCESS_WHITELIST - loadout_access = ACCESS_WHITELIST - - -/datum/patron_item/marshal_wrench - name = "Colossal Wrench" - description = "If everything else failed - bring a bigger wrench." - id = "marshal_wrench" - item_path = /obj/item/material/twohanded/fireaxe/bigwrench - store_cost = 6000 - store_access = ACCESS_PUBLIC - - category = CATEGORY_TOOLS - subcategory = SUBCATEGORY_DANGEROUS_TOOLS - - loadout_modkit_cost = 2 - modkit_access = ACCESS_PUBLIC - modkit_typelist = list(/obj/item/tool/wrench/big_wrench) - - -//Made public by request of commissioner -/datum/patron_item/blackwolf - name = "Wasp RIG" - description = "A lightweight and flexible armoured rig suit, offers good protection against light impacts" - item_path = /obj/item/rig/wasp - id = "blackwolf_rig" - store_cost = 9000 - store_access = ACCESS_PUBLIC - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 2 - modkit_access = ACCESS_PUBLIC - modkit_typelist = list(/obj/item/rig/engineering) - -/datum/patron_item/sea_rig - name = "Hazard Diving RIG" - description = "The heavy-duty vintage diving RIG is the standard among CEC deep sea mining operations. It's plating has been reinforced to withstand extreme undersea pressures and concussive forces." - item_path = /obj/item/rig/vintage/sea - id = "sea_rig" - store_cost = 15000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/vintage) - -/datum/patron_item/carver - name = "Spec Ops RIG" - description = "A heavily armoured rig suit, designed for military use. Especially effective against bullets." - item_path = /obj/item/rig/security/pcsi/carver - id = "carver_rig" - store_cost = 12000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/security/pcsi) - -/datum/patron_item/dad_rig - name = "Elite Diving RIG" - description = "The elite diving RIG is the next generation of diving RIGs used among CEC deep sea mining operations. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility." - item_path = /obj/item/rig/advanced/dad - id = "dad_rig" - store_cost = 15000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/advanced) - -/datum/patron_item/sister_rig - name = "Strange Diving RIG" - description = "a strange diving RIG with a cage on the shoulder and symbols drawn upon the suit. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility." - item_path = /obj/item/rig/advanced/sister - id = "sister_rig" - store_cost = 15000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/advanced) - -/datum/patron_item/muramasa - name = "Experimental Ceremonial Sword" - description = "A blade passed down through generations of a dedicated unitologist family, the Higgins. Sam had it modified into a experimental ceremonial blade, enhancing the already astonishing properties of the original metal and giving it an ominous crimson glow that matches the Marker. An explosive charge housed in the scabbard enables a lightning-quick draw." - id = "muramasa" - item_path = /obj/item/material/twohanded/muramasa - - store_cost = 4000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_TOOLS - subcategory = SUBCATEGORY_DANGEROUS_TOOLS - - loadout_modkit_cost = 1 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/tool/pickaxe/laser) - -/datum/patron_item/muramasa_sheath - name = "Ceremonial Sheath" - id = "muramasa_sheath" - item_path = /obj/item/storage/belt/holster/muramasa - store_cost = 1500 - store_access = ACCESS_WHITELIST - description = "A lavishly decorated ceremonial sheath, looks oddly gun-shaped." - loadout_cost = 1 - loadout_access = ACCESS_WHITELIST - - category = CATEGORY_TOOLS - subcategory = SUBCATEGORY_DANGEROUS_TOOLS - -/datum/patron_item/tarnished - name = "Tarnished RIG" - description = "A rig made from the reforged armor of his family that was passed from generation to generations for decades." - item_path = /obj/item/rig/advanced/tarnished - id = "tarnished" - store_cost = 15000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/advanced) - - -/datum/patron_item/arctic_suit //public for all patrons - name = "Arctic Survival RIG" - description = "A standard-issue Sovereign Colonies RIG used for exploring and generally weathering harsh environments otherwise hostile to human life, from space to an icy alien tundra." - item_path = /obj/item/rig/arctic - id = "arctic" - store_cost = 15000 //same as advanced rig - store_access = ACCESS_PATRONS - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - -/datum/patron_item/witness - name = "Witness RIG" - description = "A Sovereign Colonies all-purpose survival RIG painted in a mesmerizing fashion as a tribute to the Church of Unitology and the general faith they hold." - item_path = /obj/item/rig/arctic/witness - id = "witness" - store_cost = 15000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/advanced) - - -/datum/patron_item/survivor - name = "PCSI Survivor RIG" - description = "The RIG remains battered and beaten, dented and missing pieces. The blood remains permanently rusted to the frame. The will of the survivor remains unbroken." - item_path = /obj/item/rig/security/pcsi/ruined - id = "psci_survivor" - store_cost = 12000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/security/pcsi) - - -/datum/patron_item/forged - name = "Forged Engineering RIG" - description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering." - item_path = /obj/item/rig/engineering/forged - id = "forged" - store_cost = 8000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_WHITELIST - modkit_typelist = list(/obj/item/rig/engineering) - -/datum/patron_item/flesh - name = "Fleshy Power Node" - description = "Use on a zealot rig to obtain" - item_path = /obj/item/stack/special_node/evil - id = "flesh" - store_cost = 1000 - store_access = ACCESS_WHITELIST - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - -/datum/patron_item/heavy - name = "Antique Heavy-Duty CEC RIG" - description = "The heavy-duty vintage CEC RIG is used in the most hazardous engineering operations aboard CEC vessels. Its heavier armor plating can withstand more blunt damage than most CEC suits, and can withstand radiation just as well. As working conditions on CEC ships have improved, this RIG has been discontinued, but some heavy variants can still be found on old planet crackers." - item_path = /obj/item/rig/vintage/heavy - id = "vintage_suit" - store_cost = 15000 - store_access = ACCESS_PATRONS - - category = CATEGORY_RIG - subcategory = SUBCATEGORY_FRAMES - - loadout_modkit_cost = 0 - modkit_access = ACCESS_PATRONS - modkit_typelist = list(/obj/item/rig/vintage) +//Unitology Ritual Blade +//Available to all patrons, loadout only +/datum/patron_item/uni_knife + name = "unitology ritual blade" + item_path = /obj/item/material/knife/unitologist + loadout_cost = 3 + loadout_access = ACCESS_PATRONS + description = "A pristine blade used for religious ceremonies in the Church of Unitology.\ + Mechanically, it has the same stats as an ordinary boot knife, but it has two important special features.
\ +
\ + 1. While held in hand, the blade unlocks the unique Sacrifice execution move, allowing ritual murder of a human without head protection.
\ + A human sacrificed in this manner is worth more biomass when the necromorphs get to them later.
\ + Requires the victim to remain still, so best restrain them first. The ritual takes wquite a while, giving you ample opportunity for a short speech
\ + Please note that simply owning this knife does not make you an antag, and you shouldn't be murdering humans if you aren't an antagonist.
\ +
\ + 2. While equipped, both in your loadout at roundstart, and your inventory during the round, this blade gives an extra 15% chance to be picked for unitology antagonist roles.
\ + This effect does not override your preferences, if you have unitologists set to never then you still won't be picked" + + +/* + Guns +*/ +/datum/patron_item/rivet + name = "711-MarkCL Rivet Gun" + description = "The 711-MarkCL Rivet Gun is the latest refinement from Timson Tools' long line of friendly tools. Useful for rapid repairs at a distance!" + item_path = /obj/item/gun/projectile/rivet + id = "rivetgun" + store_cost = 2400 + store_access = ACCESS_PUBLIC + + loadout_cost = 4 + loadout_access = ACCESS_PATRONS + + category = CATEGORY_TOOLS + subcategory = SUBCATEGORY_DANGEROUS_TOOLS + + +/* + RIG suits +*/ +/datum/patron_item/max_stone_rig + name = "Advanced Engineering RIG" + description = "The latest in cutting-edge RIG technology, uses the standard engineering suit scheme. It has `Parker R.` engraved next to the monitor lights." + item_path = /obj/item/rig/advanced/maxstone + id = "max_stone_rig" + store_cost = 17000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/advanced) + +//This is not my typo, his ckey is actually spelled like that +/datum/patron_item/plaugewalker + name = "SCAF Elite RIG" + description = "A lightweight and flexible armoured rig suit, designed for riot control and shipboard disciplinary enforcement." + item_path = /obj/item/rig/pcsi/elite + id = "plaugewalker_rig" + store_cost = 11000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/pcsi) + + +/datum/patron_item/banditofdoom + name = "Evangelion RIG" + description = "A project many months in the works, created by an obsessive historical anime fan. Even incorporates a custom voice changer for impersonating TV characters." + item_path = /obj/item/rig/advanced/banditofdoom + id = "banditofdoom_rig" + store_cost = 17000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 2 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/advanced) + + +/datum/patron_item/hacker_rig + name = "Digital Infiltration RIG" + item_path = /obj/item/rig/hacker + id = "hacker_rig" + + loadout_cost = 4 + loadout_access = ACCESS_PATRONS + + loadout_subtype = /datum/gear/RIG/frame + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + tags = list(LOADOUT_TAG_RIG) + exclusion_tags = list(LOADOUT_TAG_RIG) + equip_adjustments = OUTFIT_ADJUSTMENT_SKIP_BACKPACK + + +/datum/patron_item/mouse + name = "mouse" + item_path = /mob/living/simple_animal/mouse + id = "mouse" + store_cost = 1000 + store_access = ACCESS_WHITELIST + loadout_access = ACCESS_WHITELIST + + +/datum/patron_item/marshal_wrench + name = "Colossal Wrench" + description = "If everything else failed - bring a bigger wrench." + id = "marshal_wrench" + item_path = /obj/item/material/twohanded/fireaxe/bigwrench + store_cost = 6000 + store_access = ACCESS_PUBLIC + + category = CATEGORY_TOOLS + subcategory = SUBCATEGORY_DANGEROUS_TOOLS + + loadout_modkit_cost = 2 + modkit_access = ACCESS_PUBLIC + modkit_typelist = list(/obj/item/tool/wrench/big_wrench) + + +//Made public by request of commissioner +/datum/patron_item/blackwolf + name = "Wasp RIG" + description = "A lightweight and flexible armoured rig suit, offers good protection against light impacts" + id = "blackwolf_rig" + item_path = /obj/item/rig/marksman/wasp + store_cost = 11500 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/marksman) + +/datum/patron_item/sea_rig + name = "Hazard Diving RIG" + description = "The heavy-duty vintage diving RIG is the standard among CEC deep sea mining operations. It's plating has been reinforced to withstand extreme undersea pressures and concussive forces." + item_path = /obj/item/rig/vintage/sea + id = "sea_rig" + store_cost = 17000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/vintage) + +/datum/patron_item/carver + name = "Spec Ops RIG" + description = "A heavily armoured rig suit, designed for military use. Especially effective against bullets." + item_path = /obj/item/rig/pcsi/carver + id = "carver_rig" + store_cost = 11000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/pcsi) + +/datum/patron_item/dad_rig + name = "Elite Diving RIG" + description = "The elite diving RIG is the next generation of diving RIGs used among CEC deep sea mining operations. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility." + item_path = /obj/item/rig/advanced/dad + id = "dad_rig" + store_cost = 17000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/advanced) + +/datum/patron_item/sister_rig + name = "Strange Diving RIG" + description = "a strange diving RIG with a cage on the shoulder and symbols drawn upon the suit. It's flexible reinforcements allow it to withstand extreme undersea pressures while retaining mobility." + item_path = /obj/item/rig/advanced/sister + id = "sister_rig" + store_cost = 17000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/advanced) + +/datum/patron_item/muramasa + name = "Experimental Ceremonial Sword" + description = "A blade passed down through generations of a dedicated unitologist family, the Higgins. Sam had it modified into a experimental ceremonial blade, enhancing the already astonishing properties of the original metal and giving it an ominous crimson glow that matches the Marker. An explosive charge housed in the scabbard enables a lightning-quick draw." + id = "muramasa" + item_path = /obj/item/material/twohanded/muramasa + + store_cost = 4000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_TOOLS + subcategory = SUBCATEGORY_DANGEROUS_TOOLS + + loadout_modkit_cost = 1 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/tool/pickaxe/laser) + +/datum/patron_item/muramasa_sheath + name = "Ceremonial Sheath" + id = "muramasa_sheath" + item_path = /obj/item/storage/belt/holster/muramasa + store_cost = 1500 + store_access = ACCESS_WHITELIST + description = "A lavishly decorated ceremonial sheath, looks oddly gun-shaped." + loadout_cost = 1 + loadout_access = ACCESS_WHITELIST + + category = CATEGORY_TOOLS + subcategory = SUBCATEGORY_DANGEROUS_TOOLS + +/datum/patron_item/tarnished + name = "Tarnished RIG" + description = "A rig made from the reforged armor of his family that was passed from generation to generations for decades." + item_path = /obj/item/rig/advanced/tarnished + id = "tarnished" + store_cost = 17000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/advanced) + + +/datum/patron_item/arctic_suit //public for all patrons + name = "Arctic Survival RIG" + description = "A standard-issue Sovereign Colonies RIG used for exploring and generally weathering harsh environments otherwise hostile to human life, from space to an icy alien tundra." + item_path = /obj/item/rig/advanced/arctic + id = "arctic" + store_cost = 17000 //same as advanced rig + store_access = ACCESS_PATRONS + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + +/datum/patron_item/witness + name = "Witness RIG" + description = "A Sovereign Colonies all-purpose survival RIG painted in a mesmerizing fashion as a tribute to the Church of Unitology and the general faith they hold." + item_path = /obj/item/rig/advanced/arctic/witness + id = "witness" + store_cost = 17000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/advanced) + + +/datum/patron_item/survivor + name = "PCSI Survivor RIG" + description = "The RIG remains battered and beaten, dented and missing pieces. The blood remains permanently rusted to the frame. The will of the survivor remains unbroken." + item_path = /obj/item/rig/pcsi/ruined + id = "psci_survivor" + store_cost = 11000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/pcsi) + + +/datum/patron_item/forged + name = "Forged Engineering RIG" + description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering." + item_path = /obj/item/rig/engineering/forged + id = "forged" + store_cost = 6500 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/engineering) + +/datum/patron_item/flesh + name = "Fleshy Power Node" + description = "Use on a zealot rig to obtain" + item_path = /obj/item/stack/special_node/evil + id = "flesh" + store_cost = 1000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + +/datum/patron_item/heavy + name = "Antique Heavy-Duty CEC RIG" + description = "The heavy-duty vintage CEC RIG is used in the most hazardous engineering operations aboard CEC vessels. Its heavier armor plating can withstand more blunt damage than most CEC suits, and can withstand radiation just as well. As working conditions on CEC ships have improved, this RIG has been discontinued, but some heavy variants can still be found on old planet crackers." + item_path = /obj/item/rig/vintage/heavy + id = "vintage_suit" + store_cost = 17000 + store_access = ACCESS_PATRONS + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_PATRONS + modkit_typelist = list(/obj/item/rig/vintage) + +/datum/patron_item/forged_sta + name = "Standard Forged Engineering RIG" + description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering." + item_path = /obj/item/rig/engineering/forged_new + id = "engineer_standard_forged_rig" + store_cost = 6500 + store_access = ACCESS_PATRONS + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_PATRONS + modkit_typelist = list(/obj/item/rig/engineering) + +/datum/patron_item/forged_int + name = "Intermediate Forged Engineering RIG" + description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering." + item_path = /obj/item/rig/intermediate/forged + id = "engineer_intermediate_forged_rig" + store_cost = 10000 + store_access = ACCESS_PATRONS + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_PATRONS + modkit_typelist = list(/obj/item/rig/intermediate) + +/datum/patron_item/forged_adv + name = "Advanced Forged Engineering RIG" + description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering." + item_path = /obj/item/rig/advanced/forged + id = "engineer_advanced_forged_rig" + store_cost = 17000 + store_access = ACCESS_PATRONS + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_PATRONS + modkit_typelist = list(/obj/item/rig/advanced) + +/datum/patron_item/intermediate/survivor + name = "Intermediate Survivor Engineering RIG" + description = "A lightweight and flexible armoured rig suit, designed for mining and shipboard engineering." + item_path = /obj/item/rig/intermediate/survivor + id = "intermediate_engineer_survivor_rig" + store_cost = 10000 + store_access = ACCESS_WHITELIST + + category = CATEGORY_RIG + subcategory = SUBCATEGORY_FRAMES + + loadout_modkit_cost = 0 + modkit_access = ACCESS_WHITELIST + modkit_typelist = list(/obj/item/rig/intermediate) diff --git a/code/modules/projectiles/guns/ds13/divet.dm b/code/modules/projectiles/guns/ds13/divet.dm index 00e94f0c6b9..338106ccaf1 100644 --- a/code/modules/projectiles/guns/ds13/divet.dm +++ b/code/modules/projectiles/guns/ds13/divet.dm @@ -45,8 +45,9 @@ Divet pistol typedef & logic icon_state = "divet_spec" item_state = "divet_spec" silenced = TRUE - damage_factor = 0.85 //Silencers reduce bullet speed, and hence damage output + damage_factor = 0.95 //Silencers reduce bullet speed, and hence damage output tier_2_bonus = 1 + tier_1_bonus = 1 /obj/item/gun/projectile/divet/rending name = "jury-rigged divet pistol" diff --git a/code/modules/projectiles/guns/ds13/plasma_cutter.dm b/code/modules/projectiles/guns/ds13/plasma_cutter.dm index 95e0b8f77f2..eb096356117 100644 --- a/code/modules/projectiles/guns/ds13/plasma_cutter.dm +++ b/code/modules/projectiles/guns/ds13/plasma_cutter.dm @@ -6,8 +6,7 @@ icon_state = "plasmacutter" item_state = "plasmacutter" fire_sound = 'sound/weapons/plasma_cutter.ogg' - slot_flags = SLOT_BELT|SLOT_BACK - w_class = ITEM_SIZE_NORMAL + w_class = ITEM_SIZE_SMALL force = 8 origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ENGINEERING = 6, TECH_COMBAT = 3) matter = list(MATERIAL_STEEL = 4000) diff --git a/code/modules/projectiles/guns/ds13/rivet_gun.dm b/code/modules/projectiles/guns/ds13/rivet_gun.dm index dff20e48cbb..f88b0dc4ea9 100644 --- a/code/modules/projectiles/guns/ds13/rivet_gun.dm +++ b/code/modules/projectiles/guns/ds13/rivet_gun.dm @@ -37,7 +37,7 @@ firemodes = list( - list(mode_name = "rivet", mode_type = /datum/firemode), + FULL_AUTO_300, list(mode_name = "fragmentate", mode_type = /datum/firemode/rivet_frag) ) @@ -140,13 +140,13 @@ Projectile */ /obj/item/projectile/bullet/rivet - damage = 10 //Not really meant for direct fire + damage = 13.25 //Not really meant for direct fire expiry_method = EXPIRY_FADEOUT muzzle_type = /obj/effect/projectile/pulse/muzzle/light //fire_sound='sound/weapons/guns/fire/divet_fire.ogg' + armor_penetration = 7.5 structure_damage_factor = 1 - penetration_modifier = 0 - penetrating = FALSE + penetration_modifier = 1.1 var/repair_power = 80 var/deployed = FALSE diff --git a/code/modules/projectiles/guns/ds13/seeker.dm b/code/modules/projectiles/guns/ds13/seeker.dm index 20f5dd17337..97d57438376 100644 --- a/code/modules/projectiles/guns/ds13/seeker.dm +++ b/code/modules/projectiles/guns/ds13/seeker.dm @@ -6,19 +6,20 @@ item_state = "seeker" wielded_item_state = "seeker-wielded" w_class = ITEM_SIZE_HUGE + force = 10 handle_casings = CLEAR_CASINGS magazine_type = /obj/item/ammo_magazine/seeker allowed_magazines = /obj/item/ammo_magazine/seeker load_method = MAGAZINE caliber = "seeker" slot_flags = SLOT_BACK - accuracy = -30 //Don't try to hipfire + one_hand_penalty = -30 //Don't try to hipfire + accuracy = -10 ammo_type = /obj/item/ammo_casing/seeker mag_insert_sound = 'sound/weapons/guns/interaction/rifle_load.ogg' mag_remove_sound = 'sound/weapons/guns/interaction/pulse_magout.ogg' - one_hand_penalty = -30 //Don't try to fire this with one hand fire_sound = 'sound/weapons/gunshot/sniper.ogg' - aiming_modes = list(/datum/extension/aim_mode/sniper/seeker, /datum/extension/aim_mode/sniper/seeker/far, /datum/extension/aim_mode/sniper/seeker/near) + aiming_modes = list(/datum/extension/aim_mode/sniper/seeker) firemodes = list( @@ -43,7 +44,7 @@ /obj/item/projectile/bullet/seeker icon_state = "seeker" - damage = 50 + damage = 40 embed = 1 structure_damage_factor = 3 penetration_modifier = 1.25 diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index e4f99f0be76..188d24c5ca8 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -537,7 +537,7 @@ icon = 'icons/obj/drinks.dmi' icon_state = "ds_medipack" starts_with = list(/datum/reagent/ds_medicalgelreagent = 20) - amount_per_transfer_from_this = 5 + amount_per_transfer_from_this = 10 volume = 20 /obj/item/reagent_containers/hypospray/autoinjector/ds_medigel/update_icon() @@ -546,5 +546,6 @@ /obj/item/reagent_containers/hypospray/autoinjector/ds_medigel/small name = "small medical pack" desc = "A small medi-gel container to treat life threatening injuries." - starts_with = list(/datum/reagent/ds_medicalgelreagent = 5) - volume = 5 \ No newline at end of file + starts_with = list(/datum/reagent/ds_medicalgelreagent = 10) + amount_per_transfer_from_this = 5 + volume = 10 \ No newline at end of file diff --git a/code/modules/research/designs/design_rig.dm b/code/modules/research/designs/design_rig.dm index bcee86022a6..19bcd823caa 100644 --- a/code/modules/research/designs/design_rig.dm +++ b/code/modules/research/designs/design_rig.dm @@ -7,11 +7,23 @@ //Tier 0: civilian grade rigs (no modules/little to no armor) /datum/design/item/rig/civ build_path = /obj/item/rig/civilian - price = 500 + price = 100 /datum/design/item/rig/civ/slim build_path = /obj/item/rig/civilian/slim - price = 500 + price = 100 + +/datum/design/item/rig/emergency/astro + build_path = /obj/item/rig/emergency/astro + price = 1000 + +/datum/design/item/rig/firesuit + build_path = /obj/item/rig/firesuit + price = 1000 + +/datum/design/item/rig/medical + build_path = /obj/item/rig/medical + price = 3000 //good against burns/toxins /datum/design/item/rig/clown name = "ERROR_404_RIG_NOT_FOUND" @@ -25,54 +37,58 @@ //Tier I: standard protection and modules -/datum/design/item/rig/fire - build_path = /obj/item/rig/firesuit - price = 4000 //weak, good against burns - /datum/design/item/rig/mining build_path = /obj/item/rig/mining price = 6000 -/datum/design/item/rig/medical - build_path = /obj/item/rig/medical - price = 6500 //good against burns/toxins - -/datum/design/item/rig/excavation - build_path = /obj/item/rig/excavation - price = 7000 - /datum/design/item/rig/eng build_path = /obj/item/rig/engineering - price = 8000 //moderate protection + price = 6500 //moderate protection +/datum/design/item/rig/excavation + build_path = /obj/item/rig/excavation + price = 9000 +/datum/design/item/rig/intermediate + build_path = /obj/item/rig/intermediate + price = 10000 //Tier II: high protection and advanced modules -/datum/design/item/rig/patrol - build_path = /obj/item/rig/patrol - price = 11000 //standard security rig for patrol -/datum/design/item/rig/sec - build_path = /obj/item/rig/security - price = 11000 //standard security rig +/datum/design/item/rig/marksman + build_path = /obj/item/rig/marksman + price = 10500 //SSO /datum/design/item/rig/pcsi - build_path = /obj/item/rig/security/pcsi - price = 12000 //armory rig + build_path = /obj/item/rig/pcsi + price = 11000 //armory rig -/datum/design/item/rig/marksman - build_path = /obj/item/rig/marksman - price = 13000 //SSO +/datum/design/item/rig/sec + build_path = /obj/item/rig/pcsi/security + price = 11000 //standard security rig +/datum/design/item/rig/patrol + build_path = /obj/item/rig/riot/patrol + price = 12000 //standard security rig for patrol /datum/design/item/rig/riot build_path = /obj/item/rig/riot - price = 14000 //for melee combat, kinda worse at everything else + price = 12000 //for melee combat, kinda worse at everything else + +//Tier III: high protection and advanced modules /datum/design/item/rig/vintage build_path = /obj/item/rig/vintage - price = 15000 //tanky rig, slow + price = 17000 //tanky rig, slow /datum/design/item/rig/advanced build_path = /obj/item/rig/advanced - price = 15000 //good all-rounder, comes with great modules + price = 17000 //good all-rounder, comes with great modules + +/datum/design/item/rig/advanced/engineering + build_path = /obj/item/rig/advanced/engineering + price = 17000 + +/datum/design/item/rig/advanced/mining + build_path = /obj/item/rig/advanced/mining + price = 17000 \ No newline at end of file diff --git a/code/modules/research/designs/design_weapons.dm b/code/modules/research/designs/design_weapons.dm index 961baf6d1d0..dc60ef86f70 100644 --- a/code/modules/research/designs/design_weapons.dm +++ b/code/modules/research/designs/design_weapons.dm @@ -318,20 +318,6 @@ S fuel tank (hydrazine) build_path = /obj/item/ammo_magazine/sawblades/diamond price = 2900 -/datum/design/item/weapon/plasmasword - name = "experimental mining blade" - id = "plasmasword" - materials = list(MATERIAL_STEEL = 4000, MATERIAL_DIAMOND = 4000) - build_path = /obj/item/material/twohanded/muramasa/plasmasword - price = 4000 - -/datum/design/item/weapon/sheath - name = "experimental blade sheath" - id = "sheath" - materials = list(MATERIAL_STEEL = 4000) - build_path = /obj/item/storage/belt/holster/sheath - price = 3000 - //Support Weapons /datum/design/item/ammo/line_rack name = "line racks" diff --git a/icons/mob/light_overlays.dmi b/icons/mob/light_overlays.dmi index d939948829e..fc8a458e67d 100644 Binary files a/icons/mob/light_overlays.dmi and b/icons/mob/light_overlays.dmi differ diff --git a/icons/mob/onmob/feet.dmi b/icons/mob/onmob/feet.dmi index 943bbc3704f..f21f19e8be6 100644 Binary files a/icons/mob/onmob/feet.dmi and b/icons/mob/onmob/feet.dmi differ diff --git a/icons/mob/onmob/hands.dmi b/icons/mob/onmob/hands.dmi index 3cf21caaf29..a6586e22e4d 100644 Binary files a/icons/mob/onmob/hands.dmi and b/icons/mob/onmob/hands.dmi differ diff --git a/icons/mob/onmob/head.dmi b/icons/mob/onmob/head.dmi index 0c2a5cbcb1c..6d74732dae4 100644 Binary files a/icons/mob/onmob/head.dmi and b/icons/mob/onmob/head.dmi differ diff --git a/icons/mob/onmob/items/lefthand.dmi b/icons/mob/onmob/items/lefthand.dmi index 5658c56c3e1..c93cbafdbdb 100644 Binary files a/icons/mob/onmob/items/lefthand.dmi and b/icons/mob/onmob/items/lefthand.dmi differ diff --git a/icons/mob/onmob/items/righthand.dmi b/icons/mob/onmob/items/righthand.dmi index 81da3fd8585..05931d9325c 100644 Binary files a/icons/mob/onmob/items/righthand.dmi and b/icons/mob/onmob/items/righthand.dmi differ diff --git a/icons/mob/onmob/modular_armor.dmi b/icons/mob/onmob/modular_armor.dmi index a5b6a620ce3..dbc1680b1b7 100644 Binary files a/icons/mob/onmob/modular_armor.dmi and b/icons/mob/onmob/modular_armor.dmi differ diff --git a/icons/mob/onmob/rig_back.dmi b/icons/mob/onmob/rig_back.dmi index c60f72efaa4..1fce169dcb7 100644 Binary files a/icons/mob/onmob/rig_back.dmi and b/icons/mob/onmob/rig_back.dmi differ diff --git a/icons/mob/onmob/suit.dmi b/icons/mob/onmob/suit.dmi index b6e131ffa04..6874870ae3b 100644 Binary files a/icons/mob/onmob/suit.dmi and b/icons/mob/onmob/suit.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 6c83b640756..b43b707fcfa 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index f5ba6876d12..81e19bb68f0 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/modular_armor.dmi b/icons/obj/clothing/modular_armor.dmi index 4957d8df3f4..57466e9b801 100644 Binary files a/icons/obj/clothing/modular_armor.dmi and b/icons/obj/clothing/modular_armor.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index abf11ec5d76..27e752458d3 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 6940d3d563f..915b7ef4a6a 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/light_overlays.dmi b/icons/obj/light_overlays.dmi index 1ad86d5d0b4..a9e767887b9 100644 Binary files a/icons/obj/light_overlays.dmi and b/icons/obj/light_overlays.dmi differ diff --git a/icons/obj/rig_frames.dmi b/icons/obj/rig_frames.dmi index 2f26983b347..2bf6bbb4524 100644 Binary files a/icons/obj/rig_frames.dmi and b/icons/obj/rig_frames.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index e856784f788..365920c2297 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/maps/CentCom.dmm b/maps/CentCom.dmm index 1e8fcce5599..78e0b975eae 100644 --- a/maps/CentCom.dmm +++ b/maps/CentCom.dmm @@ -6218,8 +6218,8 @@ "LZ" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/structure/table/rack, -/obj/item/rig/security/pcsi, -/obj/item/rig/security/pcsi, +/obj/item/rig/pcsi, +/obj/item/rig/pcsi, /turf/unsimulated/floor/dank/grater, /area/ERT/escapebase) "Ma" = ( diff --git a/maps/TheColony/M.02_Mining_Colony.dmm b/maps/TheColony/M.02_Mining_Colony.dmm index 0e93b5e9ce4..92fda57a7d2 100644 --- a/maps/TheColony/M.02_Mining_Colony.dmm +++ b/maps/TheColony/M.02_Mining_Colony.dmm @@ -15031,11 +15031,11 @@ /area/mining_colony/SCAF) "aRb" = ( /obj/structure/table/rack, -/obj/item/rig/security/pcsi, -/obj/item/rig/security/pcsi, -/obj/item/rig/security/pcsi, -/obj/item/rig/security/pcsi, -/obj/item/rig/security/pcsi, +/obj/item/rig/pcsi, +/obj/item/rig/pcsi, +/obj/item/rig/pcsi, +/obj/item/rig/pcsi, +/obj/item/rig/pcsi, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/light, /turf/simulated/floor/dank/slides{ diff --git a/maps/USGIshimura/M.04 Ishimura (M).dmm b/maps/USGIshimura/M.04 Ishimura (M).dmm index 30cf69e2655..bd5165115bb 100644 --- a/maps/USGIshimura/M.04 Ishimura (M).dmm +++ b/maps/USGIshimura/M.04 Ishimura (M).dmm @@ -21207,9 +21207,9 @@ icon_state = "4-8" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/rig/security/pcsi, -/obj/item/rig/security/pcsi, -/obj/item/rig/security/pcsi, +/obj/item/rig/pcsi, +/obj/item/rig/pcsi, +/obj/item/rig/pcsi, /turf/simulated/floor/tiled/dark/monotile, /area/ishimura/upper/security/armory) "aQt" = (