diff --git a/aurorastation.dme b/aurorastation.dme index 0477d3b1006..74b7e35ec88 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -320,11 +320,11 @@ #include "code\datums\outfits\outfit.dm" #include "code\datums\outfits\outfit_admin.dm" #include "code\datums\outfits\outfit_antag.dm" +#include "code\datums\outfits\ert\ap_eridani.dm" #include "code\datums\outfits\ert\deathsquad.dm" #include "code\datums\outfits\ert\fsf.dm" #include "code\datums\outfits\ert\iac.dm" #include "code\datums\outfits\ert\kataphract.dm" -#include "code\datums\outfits\ert\med_eridani.dm" #include "code\datums\outfits\ert\mercenary.dm" #include "code\datums\outfits\ert\nt_ert.dm" #include "code\datums\outfits\ert\syndicate.dm" @@ -1745,11 +1745,11 @@ #include "code\modules\ghostroles\spawner\human\zenghu.dm" #include "code\modules\ghostroles\spawner\human\admin\admin.dm" #include "code\modules\ghostroles\spawner\human\admin\ccia.dm" +#include "code\modules\ghostroles\spawner\human\responseteams\ap_eridani.dm" #include "code\modules\ghostroles\spawner\human\responseteams\deathsquad.dm" #include "code\modules\ghostroles\spawner\human\responseteams\fsf.dm" #include "code\modules\ghostroles\spawner\human\responseteams\iac.dm" #include "code\modules\ghostroles\spawner\human\responseteams\kataphracts.dm" -#include "code\modules\ghostroles\spawner\human\responseteams\med_eridani.dm" #include "code\modules\ghostroles\spawner\human\responseteams\mercenary.dm" #include "code\modules\ghostroles\spawner\human\responseteams\nt_ert.dm" #include "code\modules\ghostroles\spawner\human\responseteams\response_team.dm" diff --git a/code/datums/ert/outsider.dm b/code/datums/ert/outsider.dm index 3321e788869..d43e5b7f12e 100644 --- a/code/datums/ert/outsider.dm +++ b/code/datums/ert/outsider.dm @@ -16,10 +16,10 @@ equipment_map = /datum/map_template/distress_iac admin = TRUE -/datum/responseteam/med_eridani - name = "Eridani Medical Team" +/datum/responseteam/ap_eridani + name = "Eridani Asset Protection Team" chance = 15 - spawner = /datum/ghostspawner/human/ert/med_eridani + spawner = /datum/ghostspawner/human/ert/ap_eridani equipment_map = /datum/map_template/distress_iac /datum/responseteam/fsf diff --git a/code/datums/outfits/ert/ap_eridani.dm b/code/datums/outfits/ert/ap_eridani.dm new file mode 100644 index 00000000000..e6309a0a94b --- /dev/null +++ b/code/datums/outfits/ert/ap_eridani.dm @@ -0,0 +1,161 @@ +/datum/outfit/admin/ert/ap_eridani + name = "Eridani Asset Protection Specialist" + + uniform = /obj/item/clothing/under/rank/security/eridani + accessory = /obj/item/clothing/accessory/holster/thigh + accessory_contents = list(/obj/item/gun/projectile/automatic/x9 = 1) + suit = /obj/item/clothing/suit/space/void/cruiser + head = /obj/item/clothing/head/helmet/space/void/cruiser + mask = /obj/item/clothing/mask/gas/tactical + shoes = /obj/item/clothing/shoes/swat/ert + gloves = /obj/item/clothing/gloves/combat + glasses = /obj/item/clothing/glasses/sunglasses + suit_store = /obj/item/gun/energy/rifle + back = /obj/item/storage/backpack/satchel_sec + belt = /obj/item/storage/belt/military + id = /obj/item/card/id/distress/ap_eridani + l_ear = /obj/item/device/radio/headset/distress + l_pocket = /obj/item/grenade/chem_grenade/teargas + r_pocket = /obj/item/tank/emergency_oxygen/double + + backpack_contents = list( + /obj/item/storage/box/survival = 1, + /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, + /obj/item/storage/firstaid/regular = 1, + /obj/item/clothing/head/softcap/eri = 1, + /obj/item/gun/energy/gun/nuclear = 1, + /obj/item/storage/belt/utility/very_full = 1 + ) + + belt_contents = list( + /obj/item/ammo_magazine/c45x = 3, + /obj/item/device/flash = 1, + /obj/item/handcuffs/ziptie = 1, + /obj/item/melee/baton/stunrod = 1, + /obj/item/device/flashlight/maglight = 1, + /obj/item/shield/riot/tact = 1, + /obj/item/grenade/flashbang = 1 + ) + +/datum/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + + if(H?.w_uniform) + var/obj/item/clothing/uniform = H.w_uniform + var/obj/item/clothing/accessory/sleevepatch/erisec/armband = new(src) + uniform.attach_accessory(null, armband) + + if(!H.shoes) + var/obj/item/clothing/shoes/jackboots/toeless/shoes = new(src) + H.equip_to_slot_if_possible(shoes, slot_shoes) + +/datum/outfit/admin/ert/ap_eridani/lead + name = "Eridani Section Leader" + + uniform = /obj/item/clothing/under/rank/security/eridani/alt + suit = null + head = /obj/item/clothing/head/beret/security/eri + mask = /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba + back = /obj/item/rig/strike/distress + suit_store = null + l_hand = /obj/item/gun/energy/rifle + r_hand = /obj/item/flame/lighter/zippo + l_pocket = /obj/item/clothing/mask/gas/tactical + r_pocket = /obj/item/storage/box/fancy/cigarettes/cigar + + backpack_contents = list() + + belt_contents = list( + /obj/item/ammo_magazine/c45x = 3, + /obj/item/device/flash = 1, + /obj/item/handcuffs/ziptie = 1, + /obj/item/melee/baton/stunrod = 1, + /obj/item/grenade/flashbang = 1, + /obj/item/shield/riot/tact = 1, + /obj/item/melee/telebaton = 1 + ) + +/datum/outfit/admin/ert/ap_eridani/doctor + name = "Eridani Medical Officer" + + uniform = /obj/item/clothing/under/rank/eridani_medic + suit = /obj/item/clothing/suit/storage/medical_chest_rig + suit_store = /obj/item/clothing/head/hardhat/first_responder + head = /obj/item/clothing/head/beret/security/eri + mask = /obj/item/clothing/mask/surgical + glasses = /obj/item/clothing/glasses/hud/health/aviator + shoes = /obj/item/clothing/shoes/swat/ert + gloves = /obj/item/clothing/gloves/latex/nitrile + belt = /obj/item/storage/belt/medical/first_responder/combat + back = /obj/item/storage/backpack/satchel_med + accessory = /obj/item/clothing/accessory/holster/thigh + accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1) + r_ear = /obj/item/device/flashlight/pen + l_pocket = /obj/item/device/healthanalyzer + r_pocket = /obj/item/melee/telebaton + l_hand = /obj/item/clothing/head/helmet/space/void/medical + r_hand = /obj/item/clothing/suit/space/void/medical + + + backpack_contents = list( + /obj/item/storage/box/survival = 1, + /obj/item/storage/firstaid/adv = 1, + /obj/item/storage/firstaid/surgery = 1, + /obj/item/device/advanced_healthanalyzer = 1, + /obj/item/clothing/accessory/storage/pouches/black = 1, + /obj/item/reagent_containers/glass/bottle/thetamycin = 1, + /obj/item/surgery/scalpel/manager = 1, + /obj/item/tank/emergency_oxygen/double = 1 + ) + + belt_contents = list( + /obj/item/reagent_containers/hypospray/combat/empty = 1, + /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, + /obj/item/reagent_containers/glass/bottle/antitoxin = 1, + /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, + /obj/item/reagent_containers/glass/bottle/butazoline = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/perconol = 1, + /obj/item/storage/pill_bottle/mortaphenyl = 1 + ) + +/datum/outfit/admin/ert/ap_eridani/corpsman + name = "Eridani Corpsman" + + uniform = /obj/item/clothing/under/rank/eridani_medic + suit = /obj/item/clothing/suit/storage/medical_chest_rig + suit_store = /obj/item/clothing/head/hardhat/first_responder + head = /obj/item/clothing/head/softcap/eri + mask = /obj/item/clothing/mask/surgical + glasses = /obj/item/clothing/glasses/hud/health/aviator + gloves = /obj/item/clothing/gloves/latex/nitrile + shoes = /obj/item/clothing/shoes/swat/ert + back = /obj/item/storage/backpack/messenger/med + belt = /obj/item/storage/belt/medical/first_responder/combat + accessory = /obj/item/clothing/accessory/holster/thigh + accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1) + l_pocket = /obj/item/device/healthanalyzer + r_pocket = /obj/item/crowbar + l_hand = /obj/item/storage/firstaid/adv + + backpack_contents = list( + /obj/item/storage/box/survival = 1, + /obj/item/storage/firstaid/adv = 1, + /obj/item/storage/firstaid/combat = 1, + /obj/item/clothing/accessory/storage/pouches/black = 1, + /obj/item/reagent_containers/glass/bottle/thetamycin = 1, + /obj/item/storage/pill_bottle/mortaphenyl = 1 + ) + + belt_contents = list( + /obj/item/reagent_containers/hypospray/combat/empty = 1, + /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, + /obj/item/reagent_containers/glass/bottle/antitoxin = 1, + /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, + /obj/item/reagent_containers/glass/bottle/butazoline = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/perconol = 1, + /obj/item/melee/baton/stunrod = 1 + ) diff --git a/code/datums/outfits/ert/med_eridani.dm b/code/datums/outfits/ert/med_eridani.dm deleted file mode 100644 index d9de92217eb..00000000000 --- a/code/datums/outfits/ert/med_eridani.dm +++ /dev/null @@ -1,108 +0,0 @@ -/datum/outfit/admin/ert/med_eridani - name = "Eridani Contractor Doctor" - - uniform = /obj/item/clothing/under/rank/eridani_medic - suit = /obj/item/clothing/suit/storage/medical_chest_rig - head = /obj/item/clothing/head/beret/security/eri - mask = /obj/item/clothing/mask/surgical - glasses = /obj/item/clothing/glasses/hud/health/aviator - shoes = /obj/item/clothing/shoes/jackboots - gloves = /obj/item/clothing/gloves/white - belt = /obj/item/storage/belt/medical - back = /obj/item/storage/backpack/satchel_med - accessory = /obj/item/clothing/accessory/storage/white_vest - accessory_contents = list(/obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/reagent_containers/glass/bottle/mortaphenyl = 1) - id = /obj/item/card/id/distress/iac - - l_ear = /obj/item/device/radio/headset/distress - - backpack_contents = list( - /obj/item/storage/box/survival = 1, - /obj/item/device/healthanalyzer = 1, - /obj/item/storage/firstaid/adv = 1, - /obj/item/storage/firstaid/surgery = 1, - /obj/item/storage/box/gloves = 1, - /obj/item/storage/box/syringes = 1, - /obj/item/device/flashlight/pen = 1, - /obj/item/clothing/accessory/holster/armpit = 1, - /obj/item/gun/projectile/automatic/x9 = 1, - /obj/item/ammo_magazine/c45x = 2, - /obj/item/reagent_containers/glass/bottle/thetamycin = 1 - ) - - belt_contents = list( - /obj/item/reagent_containers/hypospray/cmo = 1, - /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, - /obj/item/reagent_containers/glass/bottle/antitoxin = 1, - /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, - /obj/item/reagent_containers/glass/bottle/butazoline = 1, - /obj/item/reagent_containers/glass/bottle/dermaline = 1, - /obj/item/reagent_containers/glass/bottle/perconol = 1 - ) - -/datum/outfit/admin/ert/med_eridani/get_id_access() - return get_distress_access() - -/datum/outfit/admin/ert/med_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - if(H?.w_uniform) - var/obj/item/clothing/uniform = H.w_uniform - var/obj/item/clothing/accessory/sleevepatch/erisec/armband = new(src) - uniform.attach_accessory(null, armband) - - if(!H.shoes) - var/obj/item/clothing/shoes/jackboots/toeless/shoes = new(src) - H.equip_to_slot_if_possible(shoes, slot_shoes) - -/datum/outfit/admin/ert/med_eridani/bodyguard - name = "Eridani Contractor Bodyguard" - - accessory = /obj/item/clothing/accessory/storage/black_vest - accessory_contents = list(/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, /obj/item/reagent_containers/hypospray/autoinjector/survival = 1) - suit = /obj/item/clothing/suit/space/void/cruiser - head = /obj/item/clothing/head/helmet/space/void/cruiser - mask = /obj/item/clothing/mask/gas/alt - glasses = /obj/item/clothing/glasses/sunglasses - suit_store = /obj/item/gun/energy/gun/nuclear - back = /obj/item/storage/backpack/ert/medical - gloves = /obj/item/clothing/gloves/white - belt = /obj/item/storage/belt/security - - backpack_contents = list( - /obj/item/storage/box/survival = 1, - /obj/item/storage/firstaid/regular = 1, - /obj/item/stack/medical/advanced/bruise_pack = 2, - /obj/item/gun/projectile/automatic/x9 = 1, - /obj/item/reagent_containers/glass/bottle/thetamycin = 1 - ) - - belt_contents = list( - /obj/item/ammo_magazine/c45x = 3, - /obj/item/device/flash = 1, - /obj/item/handcuffs/ziptie = 2, - /obj/item/melee/baton/stunrod = 1, - /obj/item/device/flashlight/flare = 1 - ) - -/datum/outfit/admin/ert/med_eridani/paramedic - name = "Eridani Contractor Paramedic" - - head = /obj/item/clothing/head/hardhat/first_responder - mask = /obj/item/clothing/mask/balaclava - back = /obj/item/storage/backpack/messenger/med - glasses = /obj/item/clothing/glasses/hud/health - - backpack_contents = list( - /obj/item/storage/box/survival = 1, - /obj/item/device/healthanalyzer = 1, - /obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1, - /obj/item/storage/firstaid/adv = 1, - /obj/item/storage/firstaid/o2 = 1, - /obj/item/storage/box/syringes = 1, - /obj/item/clothing/accessory/holster/armpit = 1, - /obj/item/gun/projectile/automatic/x9 = 1, - /obj/item/ammo_magazine/c45x = 2 - ) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index a5cf4875c89..8f7e41e8419 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -517,6 +517,17 @@ var/const/NO_EMAG_ACT = -50 access = list(access_legion, access_maint_tunnels, access_external_airlocks, access_security, access_engine, access_engine_equip, access_medical, access_research, access_atmospherics, access_medical_equip) ..() +/obj/item/card/id/distress/ap_eridani + name = "\improper Eridani identification card" + desc = "A high-tech holobadge, identifying the owner as a contractor from one of the many PMCs from the Eridani Corporate Federation." + assignment = "EPMC Asset Protection" + icon_state = "erisec_card" + overlay_state = "erisec_card" + +/obj/item/card/id/distress/ap_eridani/New() + access = list(access_distress, access_maint_tunnels, access_external_airlocks, access_security, access_medical, access_medical_equip) + ..() + /obj/item/card/id/distress/iac name = "\improper Interstellar Aid Corps ID" assignment = "Interstellar Aid Corps Responder" diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 85a0cf7880a..5f5558e2cdc 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -314,6 +314,7 @@ outfit_catagories["Freelance Mercenaries"] = typesof(/datum/outfit/admin/ert/mercenary) outfit_catagories["Free Solarian Fleets Marines"] = typesof(/datum/outfit/admin/ert/fsf) outfit_catagories["Kataphracts"] = typesof(/datum/outfit/admin/ert/kataphract) + outfit_catagories["Eridani"] = typesof(/datum/outfit/admin/ert/ap_eridani) outfit_catagories["IAC"] = typesof(/datum/outfit/admin/ert/iac) if("Admin") outfit_catagories["Stellar Corporate Conglomerate"] = typesof(/datum/outfit/admin/scc) diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 9db05acacc3..e3214c569e1 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -246,7 +246,24 @@ initial_modules = list( /obj/item/rig_module/fabricator/energy_net, /obj/item/rig_module/power_sink, - /obj/item/rig_module/mounted/taser + /obj/item/rig_module/mounted/egun, + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/ai_container, + /obj/item/rig_module/vision/nvg + ) + +/obj/item/rig/strike/distress + req_access = list(access_distress) + + initial_modules = list( + /obj/item/rig_module/fabricator/energy_net, + /obj/item/rig_module/power_sink, + /obj/item/rig_module/mounted/taser, + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/ai_container, + /obj/item/rig_module/vision/sechud ) /obj/item/rig/strike/ninja diff --git a/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm b/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm new file mode 100644 index 00000000000..9ebba32ac64 --- /dev/null +++ b/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm @@ -0,0 +1,37 @@ +/datum/ghostspawner/human/ert/ap_eridani + name = "Eridani Asset Protection Specialist" + short_name = "eridaniprotection" + mob_name_prefix = "Spc. " + max_count = 2 + desc = "A specialist suited for close asset protection and policing duties. Ensure your colleagues ledgers remain in the black." + welcome_message = "You are part of an Eridani Private Military Company Asset Protection Team, a highly trained group of security specialists and medical professionals \ + contracted by the Stellar Corporate Conglomerate to protect its investments." + outfit = /datum/outfit/admin/ert/ap_eridani + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD) + +/datum/ghostspawner/human/ert/ap_eridani/lead + name = "Eridani Section Leader" + short_name = "eridanileader" + mob_name_prefix = "Ldr. " + max_count = 1 + desc = "The leader of the EPMC Asset Protection Team. Ensure your employers bottom line remains protected and don't sign blindly." + outfit = /datum/outfit/admin/ert/ap_eridani/lead + possible_species = list(SPECIES_HUMAN) + +/datum/ghostspawner/human/ert/ap_eridani/doctor + name = "Eridani Medical Officer" + short_name = "eridanidoctor" + mob_name_prefix = "Dr. " + max_count = 1 + desc = "A highly trained Eridani medical officer and the second in command of the EPMC Asset Protection Team. Well versed in surgical procedures and expected to work in a hot zone. Not a stranger to a bank run." + outfit = /datum/outfit/admin/ert/ap_eridani/doctor + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_IPC_SHELL) + +/datum/ghostspawner/human/ert/ap_eridani/corpsman + name = "Eridani Corpsman" + short_name = "eridanicorpsman" + mob_name_prefix = "Cm. " + max_count = 2 + desc = "An Eridani corpsman that can handle nursing duties as well. Trained to operate in combat environments if needed. Make sure to check your quarterlies." + outfit = /datum/outfit/admin/ert/ap_eridani/corpsman + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) diff --git a/code/modules/ghostroles/spawner/human/responseteams/med_eridani.dm b/code/modules/ghostroles/spawner/human/responseteams/med_eridani.dm deleted file mode 100644 index 520400cb7fd..00000000000 --- a/code/modules/ghostroles/spawner/human/responseteams/med_eridani.dm +++ /dev/null @@ -1,27 +0,0 @@ -/datum/ghostspawner/human/ert/med_eridani - name = "Eridani Medical Contractor Doctor" - short_name = "eridanidoctor" - mob_name_prefix = "Dr. " - max_count = 2 - desc = "A highly trained Eridani contractor doctor medical doctor. Can do most medical procedures even under severe stress." - welcome_message = "You are part of the Eridani Medical Contractor Team, a highly trained team of medical profissional." - outfit = /datum/outfit/admin/ert/med_eridani - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_DIONA, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) - -/datum/ghostspawner/human/ert/med_eridani/bodyguard - name = "Eridani Medical Contractor Bodyguard" - short_name = "eridanidocbodyguard" - mob_name_prefix = "Bdg. " - max_count = 2 - desc = "A highly trained bodyguard. Sticks close to the medics while they work." - outfit = /datum/outfit/admin/ert/med_eridani/bodyguard - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD) - - -/datum/ghostspawner/human/ert/med_eridani/paramedic - name = "Eridani Medical Contractor Paramedic" - short_name = "eridaniparamedic" - mob_name_prefix = "Pm. " - max_count = 2 - desc = "A highly trained paramedic. You grab injured people and bring them to the medical doctor. You are trained in nursing duties as well." - outfit = /datum/outfit/admin/ert/med_eridani/paramedic diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 6ed5e710589..617168307fc 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -40,7 +40,7 @@ /obj/item/gun/energy/gun/nuclear name = "advanced energy gun" desc = "An energy gun with an experimental miniaturized reactor." - desc_info = "This is an energy weapon. To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \ + desc_info = "This is an energy weapon. To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \ then click where you want to fire. Most energy weapons can fire through windows harmlessly. To switch between stun and lethal, click the weapon \ in your hand. Unlike most weapons, this weapon recharges itself." icon = 'icons/obj/guns/nucgun.dmi' diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm index 2974467ccad..93f03fb711e 100644 --- a/code/modules/projectiles/guns/energy/rifle.dm +++ b/code/modules/projectiles/guns/energy/rifle.dm @@ -11,6 +11,7 @@ force = 10 max_shots = 20 fire_delay = 6 + burst_delay = 3 accuracy = -1 can_turret = 1 secondary_projectile_type = /obj/item/projectile/beam @@ -20,7 +21,7 @@ turret_is_lethal = 0 has_item_ratio = FALSE - fire_delay_wielded = 1 + fire_delay_wielded = 4 accuracy_wielded = 2 sel_mode = 1 diff --git a/html/changelogs/wickedcybs_yourmovecreep.yml b/html/changelogs/wickedcybs_yourmovecreep.yml new file mode 100644 index 00000000000..fe5304f4110 --- /dev/null +++ b/html/changelogs/wickedcybs_yourmovecreep.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: WickedCybs + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "The Eridani beacon team has had a massive restructuring. It's been renamed to the Eridani Asset Protection Team. The EAPT now has two focuses. Protection and medical care. Its IAC holdovers are mostly gone at this point and its members have improved weaponry and a new leader role that can be selected. I have tried to make sure this wouldn't be too overbearing. They are not doom marine giga killers but they can get the job done at least." + - tweak: "The energy rifle has been slightly nerfed to not fire as fast as you can click now. It still fires very fast though." + - tweak: "The Strike hardsuit spawns with additional modules for non-ninja antags and beacon responders. The additional modules are more themed around its policing aesthetic and include a mounted gun, actuators and more." \ No newline at end of file diff --git a/vueui/uitests/ghost_spawners.json b/vueui/uitests/ghost_spawners.json index 979f93eb0ec..6ad953075db 100644 --- a/vueui/uitests/ghost_spawners.json +++ b/vueui/uitests/ghost_spawners.json @@ -317,9 +317,9 @@ "tags": ["Response Teams"], "spawnpoints": ["ERTSpawn"] }, - "eridanidocbodyguard": { - "name": "Eridani Medical Contractor Bodyguard", - "desc": "A highly trained bodyguard. Sticks close to the medics while they work. (This spawner is not enabled.)", + "eridaniassetprotection": { + "name": "Eridani Asset Protection Specialist", + "desc": "A specialist suited for close asset protection and policing duties. Ensure your colleagues ledgers remain in the black. (This spawner is not enabled.)", "cant_spawn": "This spawner is not enabled.", "can_edit": 1, "enabled": 0, @@ -329,9 +329,9 @@ "tags": ["Response Teams"], "spawnpoints": ["ERTSpawn"] }, - "eridaniparamedic": { - "name": "Eridani Medical Contractor Paramedic", - "desc": "A highly trained paramedic. You grab injured people and bring them to the medical doctor. You are trained in nursing duties as well. (This spawner is not enabled.)", + "eridanicorpsman": { + "name": "Eridani Corpsman", + "desc": "An Eridani corpsman that can handle nursing duties as well. Trained to operate in combat environments if needed. Make sure to check your quarterlies. (This spawner is not enabled.)", "cant_spawn": "This spawner is not enabled.", "can_edit": 1, "enabled": 0, @@ -341,17 +341,29 @@ "tags": ["Response Teams"], "spawnpoints": ["ERTSpawn"] }, - "eridanidoctor": { - "name": "Eridani Medical Contractor Doctor", - "desc": "A highly trained Eridani contractor doctor medical doctor. Can do most medical procedures even under severe stress. (This spawner is not enabled.)", + "eridanileader": { + "name": "Eridani Section Leader", + "desc": "The leader of the EPMC Asset Protection Team. Ensure your employers bottom line remains protected and don't sign blindly. (This spawner is not enabled.)", "cant_spawn": "This spawner is not enabled.", "can_edit": 1, "enabled": 0, "count": 0, "spawnatoms": 0, - "max_count": 2, + "max_count": 1, "tags": ["Response Teams"], "spawnpoints": ["ERTSpawn"] + }, + "eridanidoctor": { + "name": "Eridani Medical Officer", + "desc": " highly trained Eridani medical officer and the second in command of the EPMC Asset Protection Team. Well versed in surgical procedures and expected to work in a hot zone. Not a stranger to a bank run. (This spawner is not enabled.)", + "cant_spawn": "This spawner is not enabled.", + "can_edit": 1, + "enabled": 0, + "count": 0, + "spawnatoms": 0, + "max_count": 1, + "tags": ["Response Teams"], + "spawnpoints": ["ERTSpawn"] }, "mercs": { "name": "Mercenary Medical Specialist",