diff --git a/aurorastation.dme b/aurorastation.dme index 116adf98b06..975cc1e88c8 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -320,6 +320,7 @@ #include "code\datums\outfits\outfit_admin.dm" #include "code\datums\outfits\outfit_antag.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" @@ -1666,6 +1667,7 @@ #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\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" diff --git a/code/datums/ert/outsider.dm b/code/datums/ert/outsider.dm index a4f4e192df5..3321e788869 100644 --- a/code/datums/ert/outsider.dm +++ b/code/datums/ert/outsider.dm @@ -18,12 +18,17 @@ /datum/responseteam/med_eridani name = "Eridani Medical Team" - chance = 10 + chance = 15 spawner = /datum/ghostspawner/human/ert/med_eridani equipment_map = /datum/map_template/distress_iac +/datum/responseteam/fsf + name = "Free Solarian Fleets Fireteam" + chance = 15 + spawner = /datum/ghostspawner/human/ert/fsf + /datum/responseteam/syndicate name = "Syndicate Commandos" spawner = /datum/ghostspawner/human/ert/commando admin = TRUE - chance = 1 \ No newline at end of file + chance = 1 diff --git a/code/datums/outfits/ert/fsf.dm b/code/datums/outfits/ert/fsf.dm new file mode 100644 index 00000000000..dfaf22737c9 --- /dev/null +++ b/code/datums/outfits/ert/fsf.dm @@ -0,0 +1,123 @@ +/datum/outfit/admin/ert/fsf + name = "Free Solarian Fleets Marine" + + uniform = /obj/item/clothing/under/rank/fatigues/marine + shoes = /obj/item/clothing/shoes/swat/ert + gloves = /obj/item/clothing/gloves/swat/ert + belt = /obj/item/storage/belt/military + back = /obj/item/storage/backpack/satchel_norm + head = /obj/item/clothing/head/helmet/space/void/sol + suit = /obj/item/clothing/suit/space/void/sol + suit_store = /obj/item/gun/projectile/automatic/rifle/sol + id = /obj/item/card/id/distress/fsf + l_pocket = /obj/item/tank/emergency_oxygen/double + + l_ear = /obj/item/device/radio/headset/distress + + backpack_contents = list( + /obj/item/melee/energy/sword/knife/sol = 1 + ) + + belt_contents = list( + /obj/item/ammo_magazine/c762/sol = 1, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/handcuffs/ziptie = 2, + /obj/item/grenade/frag = 1 + ) + + accessory = /obj/item/clothing/accessory/holster/hip/brown + accessory_contents = list(/obj/item/gun/projectile/pistol/sol = 1) + +/datum/outfit/admin/ert/fsf/get_id_access() + return get_distress_access_lesser() + +/datum/outfit/admin/ert/fsf/medic + name = "Free Solarian Fleets Medic" + + belt = /obj/item/storage/belt/medical + back = /obj/item/storage/backpack/satchel_med + suit_store = /obj/item/gun/projectile/shotgun/pump/combat/sol + gloves = /obj/item/clothing/gloves/latex + + backpack_contents = list( + /obj/item/storage/firstaid/combat = 1, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/storage/box/shotgunshells = 1, + /obj/item/storage/firstaid/adv = 1, + /obj/item/handcuffs/ziptie = 1, + /obj/item/stack/medical/advanced/bruise_pack = 1, + /obj/item/stack/medical/advanced/ointment = 1, + /obj/item/melee/energy/sword/knife/sol = 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/bicaridine = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/perconol = 1 + ) + +/datum/outfit/admin/ert/fsf/sapper + name = "Free Solarian Fleets Sapper" + + back = /obj/item/storage/backpack/duffel + belt = /obj/item/storage/belt/utility/very_full + gloves = /obj/item/clothing/gloves/yellow + back = /obj/item/storage/backpack/duffel/eng + suit_store = /obj/item/gun/projectile/shotgun/pump/combat/sol + accessory = /obj/item/clothing/accessory/storage/brown_vest + accessory_contents = list( + /obj/item/plastique = 5 + ) + + backpack_contents = list( + /obj/item/melee/energy/sword/knife/sol = 1, + /obj/item/handcuffs/ziptie = 1, + /obj/item/clothing/glasses/welding/superior = 1, + /obj/item/storage/box/shotgunshells = 1, + /obj/item/gun/projectile/pistol/sol = 1, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/grenade/frag = 2 + ) + + belt_contents = null + +/datum/outfit/admin/ert/fsf/leader + name = "Free Solarian Fleets Fireteam Leader" + l_hand = /obj/item/gun/projectile/automatic/rifle/sol + r_hand = null + back = /obj/item/rig/military/fsf + suit_store = null + suit = null + head = null + + backpack_contents = list() + + belt_contents = list( + /obj/item/ammo_magazine/c762/sol = 1, + /obj/item/melee/energy/sword/knife/sol = 1, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/handcuffs/ziptie = 2 + ) + +/datum/outfit/admin/ert/fsf/synth + name = "Free Solarian Fleets Synthetic Unit" + + uniform = /obj/item/clothing/under/rank/fatigues + shoes = /obj/item/clothing/shoes/jackboots + belt = /obj/item/storage/belt/utility/very_full + head = null + suit = null + suit_store = null + l_pocket = null + belt_contents = null + + l_ear = /obj/item/device/radio/headset/distress + + backpack_contents = list( + /obj/item/melee/energy/sword/knife/sol = 1, + /obj/item/ammo_magazine/mc9mm = 2 + ) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 09b3cebdc51..a5cf4875c89 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -498,6 +498,11 @@ var/const/NO_EMAG_ACT = -50 access = list(access_distress, access_maint_tunnels, access_external_airlocks) ..() +/obj/item/card/id/distress/fsf + name = "\improper Free Solarian Fleets ID" + icon_state = "centcom" + assignment = "Free Solarian Fleets Marine ID" + /obj/item/card/id/distress/kataphract name = "\improper Kataphract ID" icon_state = "centcom" diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 1c3c49cf533..15c34aae441 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -316,6 +316,20 @@ ..() icon_state = "edagger1" +/obj/item/melee/energy/sword/knife/sol + name = "solarian energy dagger" + desc = "A relatively inexpensive energy blade, this is the standard-issue combat knife given to the Solarian military." + icon_state = "sol_edagger0" + base_reflectchance = 10 + base_block_chance = 10 + active_force = 20 + force = 10 + origin_tech = list(TECH_MAGNET = 3) + +/obj/item/melee/energy/sword/knife/sol/activate(mob/living/user) + ..() + icon_state = "sol_edagger1" + /* *Power Sword */ diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 633e69227a0..85a0cf7880a 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -312,6 +312,7 @@ outfit_catagories["TCFL"] = typesof(/datum/outfit/admin/ert/legion) outfit_catagories["Syndicate"] = typesof(/datum/outfit/admin/deathsquad/syndicate) 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["IAC"] = typesof(/datum/outfit/admin/ert/iac) if("Admin") diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 5d24c2aa367..ae0465c5b23 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -531,7 +531,7 @@ /obj/item/clothing/head/navy name = "sol navy utility cover" - desc = "An eight pointed cover issued to Sol Alliance navy members as part of their field uniform." + desc = "A military cover issued to Sol Alliance navy members as part of their field uniform." icon = 'icons/obj/sol_uniform.dmi' icon_state = "greyutility" item_state = "greyutility" @@ -556,32 +556,32 @@ contained_sprite = 1 /obj/item/clothing/head/dress - name = "sol navy dress cap" - desc = "A white cap issued as part of the Sol Alliance navy dress uniform." + name = "sol navy black peaked cap" + desc = "A black cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by junior officers." icon = 'icons/obj/sol_uniform.dmi' icon_state = "whitepeakcap" item_state = "whitepeakcap" contained_sprite = 1 /obj/item/clothing/head/dress/marine - name = "sol marine dress cap" - desc = "A green cap issued as part of the Sol Alliance marine dress uniform." + name = "sol marine peaked cap" + desc = "A green cap issued as part of the Sol Alliance marine service and dress uniforms." icon = 'icons/obj/sol_uniform.dmi' icon_state = "whitepeakcap" item_state = "whitepeakcap" contained_sprite = 1 /obj/item/clothing/head/dress/officer - name = "sol navy officer dress cap" - desc = "A white cap issued as part of the Sol Alliance navy officers dress uniform." + name = "sol navy officer peaked cap" + desc = "A white cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by senior officers." icon = 'icons/obj/sol_uniform.dmi' icon_state = "whitewheelcap" item_state = "whitewheelcap" contained_sprite = 1 /obj/item/clothing/head/dress/admiral - name = "sol navy admiral dress cap" - desc = "A fancy looking cap issued to a higher member of the Sol Alliance navy." + name = "sol navy admiral peaked cap" + desc = "A white cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by admirals." icon = 'icons/obj/sol_uniform.dmi' icon_state = "admiral_cap" item_state = "admiral_cap" diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index a9660d66410..24450f7b539 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -82,6 +82,18 @@ /obj/item/rig_module/actuators/combat ) +/obj/item/rig/military/fsf + initial_modules = list( + /obj/item/rig_module/mounted, + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/power_sink, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/chem_dispenser/combat, + /obj/item/rig_module/grenade_launcher/frag, + /obj/item/rig_module/grenade_launcher, + /obj/item/rig_module/vision/nvg + ) + /obj/item/rig/military/ninja initial_modules = list( /obj/item/rig_module/maneuvering_jets, @@ -379,4 +391,4 @@ /obj/item/rig_module/mounted/energy_blade ) - allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_MEDICAL | MODULE_UTILITY \ No newline at end of file + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_MEDICAL | MODULE_UTILITY diff --git a/code/modules/clothing/under/jobs/sol.dm b/code/modules/clothing/under/jobs/sol.dm index 030257bcab0..9179a785a01 100644 --- a/code/modules/clothing/under/jobs/sol.dm +++ b/code/modules/clothing/under/jobs/sol.dm @@ -1,7 +1,7 @@ -/obj/item/clothing/under/rank/fatigues //regular sol navy combat fatigues - name = "sol navy fatigues" - desc = "Military looking uniform issued to Sol Alliance navy, to be used while in the field." +/obj/item/clothing/under/rank/fatigues //regular sol navy uniform + name = "sol navy coveralls" + desc = "Fire-retardant naval utility coveralls, worn by Solarian naval personnel serving aboard ships and in the field." icon = 'icons/obj/sol_uniform.dmi' icon_state = "sol_uniform" item_state = "sol_uniform" @@ -14,7 +14,7 @@ /obj/item/clothing/under/rank/fatigues/marine //regular sol navy marine fatigues name = "sol marine fatigues" - desc = "Military looking uniform issued to Sol Alliance marines, to be used while in the field." + desc = "A military uniform issued to Sol Alliance marines, to be used while in the field." icon = 'icons/obj/sol_uniform.dmi' icon_state = "marine_fatigue" item_state = "marine_fatigue" @@ -43,7 +43,7 @@ /obj/item/clothing/under/rank/service //navy personnel service unniform name = "sol navy service uniform" - desc = "Military looking service uniform issued to Sol Alliance navy members." + desc = "A military service uniform issued to Sol Alliance naval personnel, to be worn in environments where a utility uniform is unfitting." icon = 'icons/obj/sol_uniform.dmi' icon_state = "whiteservice" item_state = "whiteservice" @@ -51,7 +51,7 @@ /obj/item/clothing/under/rank/service/marine //sol marine service unniform name = "sol marine service uniform" - desc = "Military looking service uniform issued to Sol Alliance marines." + desc = "A military service uniform issued to Sol Alliance marines, to be worn in environments where a utility uniform is unfitting." icon = 'icons/obj/sol_uniform.dmi' icon_state = "tanutility" item_state = "tanutility" @@ -59,7 +59,7 @@ /obj/item/clothing/under/rank/dress //navy personnel dress unniform name = "sol navy dress uniform" - desc = "A fancy military looking dress uniform issued to Sol Alliance navy members." + desc = "A fancy military dress uniform issued to Sol Alliance naval personnel, to be worn in environments where a service uniform isn't formal enough." icon = 'icons/obj/sol_uniform.dmi' icon_state = "sailor" item_state = "sailor" @@ -67,31 +67,31 @@ /obj/item/clothing/under/rank/dress/marine //sol marine dress unniform name = "sol marine dress uniform" - desc = "A fancy military looking dress uniform issued to Sol Alliance marine." + desc = "A fancy military dress uniform issued to Sol Alliance marines, to be worn in environments where a service uniform isn't formal enough." icon = 'icons/obj/sol_uniform.dmi' icon_state = "mahreendress" item_state = "mahreendress" contained_sprite = 1 -/obj/item/clothing/under/rank/dress/officer //sol marine officer dress unniform - name = "sol navy commander dress uniform" - desc = "A fancy military looking dress uniform issued to high ranking Sol Alliance navy officers. This one wears the rank of Commander" - icon = 'icons/obj/sol_uniform.dmi' - icon_state = "dress" - item_state = "dress" - contained_sprite = 1 - /obj/item/clothing/under/rank/dress/subofficer //sol marine officer dress unniform - name = "sol navy lieutenant dress uniform" - desc = "A fancy military looking dress uniform issued to lower ranking Sol Alliance navy officers. This one wears the rank of Lieutenant" + name = "sol navy junior officer uniform" + desc = "A fancy military uniform issued to lower ranking Sol Alliance navy officers. An officer in this uniform would be an Ensign, Sub-Lieutenant, or Lieutenant." icon = 'icons/obj/sol_uniform.dmi' icon_state = "subdress" item_state = "subdress" contained_sprite = 1 +/obj/item/clothing/under/rank/dress/officer //sol marine officer dress unniform + name = "sol navy senior officer uniform" + desc = "A fancy military uniform issued to high ranking Sol Alliance navy officers. An officer in this uniform would be a Lieutenant Commander, Commander, or Captain." + icon = 'icons/obj/sol_uniform.dmi' + icon_state = "dress" + item_state = "dress" + contained_sprite = 1 + /obj/item/clothing/under/rank/dress/admiral //admiral uniform name = "sol navy admiral uniform" - desc = "A fancy military dress uniform issued to a higher member of the Sol Alliance navy." + desc = "A fancy military uniform issued to a higher member of the Sol Alliance navy. An officer in this uniform would be some form of Admiral." icon = 'icons/obj/sol_uniform.dmi' icon_state = "admiral_uniform" item_state = "admiral_uniform" diff --git a/code/modules/ghostroles/spawner/human/responseteams/fsf.dm b/code/modules/ghostroles/spawner/human/responseteams/fsf.dm new file mode 100644 index 00000000000..cff82da856a --- /dev/null +++ b/code/modules/ghostroles/spawner/human/responseteams/fsf.dm @@ -0,0 +1,43 @@ +/datum/ghostspawner/human/ert/fsf + name = "Free Solarian Fleets Marine" + short_name = "fsfr" + desc = "A responder from a Free Solarian Fleets marine fireteam." + welcome_message = "You're part of a marine fireteam dispatched from the FSFV Sforza, a Free Solarian Fleets destroyer on the SCC's payroll. Your primary motivation is money: the SCC pays you well, and you have a job to do." + max_count = 2 + outfit = /datum/outfit/admin/ert/fsf + mob_name_prefix = "Pfc. " + possible_species = list(SPECIES_HUMAN) + +/datum/ghostspawner/human/ert/fsf/specialist + name = "Free Solarian Fleets Sapper" + short_name = "fsfeng" + desc = "An engineering specialist from a Free Solarian Fleets marine fireteam." + max_count = 1 + outfit = /datum/outfit/admin/ert/fsf/sapper + mob_name_prefix = "Cpl. " + +/datum/ghostspawner/human/ert/fsf/specialist/med + name = "Free Solarian Fleets Medic" + short_name = "fsfmed" + desc = "A medical specialist from a Free Solarian Fleets marine fireteam." + outfit = /datum/outfit/admin/ert/fsf/medic + +/datum/ghostspawner/human/ert/fsf/leader + name = "Free Solarian Fleets Fireteam Leader" + short_name = "fsflead" + desc = "The leader of the Free Solarian Fleets marine fireteam." + max_count = 1 + outfit = /datum/outfit/admin/ert/fsf/leader + mob_name_prefix = "Sgt. " + +/datum/ghostspawner/human/ert/fsf/synth + name = "Free Solarian Fleets Synthetic Unit" + short_name = "fsfsynth" + desc = "The non-combatant synthetic unit of the Free Solarian Fleets marine fireteam, armed only for self-defense. Tasked with piloting the shuttle and providing tactical advice and overwatch. Not actually a marine itself, the synth is property of the FSF." + max_count = 1 + outfit = /datum/outfit/admin/ert/fsf/synth + mob_name_prefix = null + uses_species_whitelist = TRUE + req_species_whitelist = SPECIES_IPC + possible_species = list(SPECIES_IPC) + diff --git a/html/changelogs/dansemacabre-solgang.yml b/html/changelogs/dansemacabre-solgang.yml new file mode 100644 index 00000000000..f8e076c0fa7 --- /dev/null +++ b/html/changelogs/dansemacabre-solgang.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: DanseMacabre + +# 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: + - rscadd: "Added a new ERT - the Free Solarian Fleets Fireteam. They're a group of formerly Solarian mercenaries on the SCC's payroll. Also added a Solarian energy dagger." + - tweak: "Changed the spawning odds for the EPMC ERT." + - tweak: "Changed the descriptions for some Solarian uniform items." diff --git a/icons/mob/items/weapons/lefthand_energy.dmi b/icons/mob/items/weapons/lefthand_energy.dmi index 7bef2b986fa..611b8dca884 100644 Binary files a/icons/mob/items/weapons/lefthand_energy.dmi and b/icons/mob/items/weapons/lefthand_energy.dmi differ diff --git a/icons/mob/items/weapons/righthand_energy.dmi b/icons/mob/items/weapons/righthand_energy.dmi index 4bed6210506..dbd8c7e9258 100644 Binary files a/icons/mob/items/weapons/righthand_energy.dmi and b/icons/mob/items/weapons/righthand_energy.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index d1913dd4a41..68b6d577c8c 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ