diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index 4df83844dab..465ff76ac74 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -52,14 +52,10 @@ path = /obj/structure/closet/crate/secure/gear_loadout/dominia /datum/uplink_item/item/gear_loadout/dominia_single - name = "Empire of Dominia Assets (Single, Human)" + name = "Empire of Dominia Assets (Single)" path = /obj/structure/closet/crate/secure/gear_loadout/dominia/single item_cost = 10 -/datum/uplink_item/item/gear_loadout/dominia_single/unathi - name = "Empire of Dominia Assets (Single, Unathi)" - path = /obj/structure/closet/crate/secure/gear_loadout/dominia/single/unathi - /datum/uplink_item/item/gear_loadout/cowboys name = "Frontier Cowboys (Group)" path = /obj/structure/closet/crate/secure/gear_loadout/ram_ranch @@ -81,6 +77,15 @@ path = /obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/single item_cost = 10 +/datum/uplink_item/item/gear_loadout/legion + name = "Tau Ceti Foreign Legion Assets (Group)" + path = /obj/structure/closet/crate/secure/gear_loadout/legion + +/datum/uplink_item/item/gear_loadout/legion_single + name = "Tau Ceti Foreign Legion Assets (Single)" + path = /obj/structure/closet/crate/secure/gear_loadout/legion/single + item_cost = 10 + /datum/uplink_item/item/gear_loadout/einstein name = "Einstein Engines Assets (Group)" path = /obj/structure/closet/crate/secure/gear_loadout/einstein diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 5c759943b46..4f8ba9bb37c 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -22,7 +22,7 @@ return //it shouldn't be null, okay? if(!parts) - to_chat(user, "This kit has no parts for this modification left.") + to_chat(user, SPAN_WARNING("This kit has no parts for this modification left!")) user.drop_from_inventory(src,O) qdel(src) return @@ -34,22 +34,25 @@ var/obj/item/clothing/I = O if (!istype(I) || !allowed || !I.refittable) - to_chat(user, "[src] is unable to modify that.") + to_chat(user, SPAN_NOTICE("\The [src] is unable to modify that.")) return var/excluding = ("exclude" in I.species_restricted) var/in_list = (target_species in I.species_restricted) if (excluding ^ in_list) - to_chat(user, "[I] is already modified.") + to_chat(user, SPAN_NOTICE("\The [I] is already modified!")) return if(!isturf(O.loc)) - to_chat(user, "[O] must be safely placed on the ground for modification.") + to_chat(user, SPAN_WARNING("\The [O] must be safely placed on the ground for modification.")) return playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1) - user.visible_message("\The [user] opens \the [src] and modifies \the [O].","You open \the [src] and modify \the [O].") + user.visible_message( + SPAN_NOTICE("\The [user] opens \the [src] and modifies \the [O]."), + SPAN_NOTICE("You open \the [src] and modify \the [O].") + ) I.refit_for_species(target_species) @@ -68,7 +71,7 @@ /obj/item/device/modkit/tajaran name = "tajaran hardsuit modification kit" - desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user. This one looks like it's meant for Tajara." + desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user. This one looks like it's meant for tajara." target_species = BODYTYPE_TAJARA /obj/item/voidsuit_modkit @@ -245,6 +248,18 @@ /obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/sfa, /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/sfa ) + +/obj/item/voidsuit_modkit/dominianvoid + name = "dominian voidsman's voidsuit kit" + desc = "A highly complicated device that allows you to convert a Dominian prejoroub combat suit into its voidsman counterpart. Practical!" + desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item\ + The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit\ + or else it will be deleted." + w_class = ITEMSIZE_SMALL + suit_options = list( + /obj/item/clothing/head/helmet/space/void/dominia = /obj/item/clothing/head/helmet/space/void/dominia/voidsman, + /obj/item/clothing/suit/space/void/dominia = /obj/item/clothing/suit/space/void/dominia/voidsman + ) /obj/item/storage/box/srf name = "srf modkit box" @@ -279,4 +294,9 @@ /obj/item/storage/box/sfa name = "sfa modkit box" desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." - starts_with = list(/obj/item/voidsuit_modkit/sfa = 4) \ No newline at end of file + starts_with = list(/obj/item/voidsuit_modkit/sfa = 4) + +/obj/item/storage/box/dominianvoid + name = "dominian voidsman's modkit box" + desc = "Contains modkits to convert Dominian voidsuits into a voidsman's variant." + starts_with = list(/obj/item/voidsuit_modkit/dominianvoid = 4) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index e65acf8b899..aefd76b4564 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -1,6 +1,11 @@ /obj/structure/closet/crate/secure/gear_loadout desc = "A secure gear crate." name = "gear crate" + +/obj/structure/closet/crate/secure/gear_loadout/legion + desc = "A secure crate with Tau Ceti Foreign Legion branding." + name = "tcfl gear crate" + icon_state = "tcfl_crate" /obj/structure/closet/crate/gear_loadout/hephaestus desc = "A sturdy crate with Hephaestus Industries branding." @@ -26,6 +31,7 @@ icon_state = "necro_crate" door_hinge = 0.5 + /obj/structure/closet/crate/secure/gear_loadout/coalition/fill() new /obj/item/rig/gunslinger/equipped(src) new /obj/item/clothing/head/helmet/space/void/coalition(src) @@ -67,6 +73,19 @@ new /obj/item/ammo_magazine/gauss/emp(src) /obj/structure/closet/crate/secure/gear_loadout/eridani/fill() + new /obj/item/clothing/under/rank/security/pmc/epmc(src) + new /obj/item/clothing/under/rank/security/pmc/epmc(src) + new /obj/item/clothing/under/rank/security/pmc/epmc(src) + new /obj/item/clothing/under/rank/security/pmc/epmc(src) + new /obj/item/clothing/under/rank/security/pmc/epmc(src) + new /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc(src) + new /obj/item/clothing/under/rank/security/pmc/epmc/alt(src) + new /obj/item/clothing/head/beret/corporate/pmc/epmc(src) + new /obj/item/clothing/head/beret/corporate/pmc/epmc(src) + new /obj/item/clothing/head/beret/corporate/pmc/epmc(src) + new /obj/item/clothing/head/softcap/pmc/epmc(src) + new /obj/item/clothing/head/softcap/pmc/epmc(src) + new /obj/item/clothing/head/softcap/pmc/epmc(src) new /obj/item/rig/strike/equipped(src) new /obj/item/clothing/head/helmet/space/void/cruiser(src) new /obj/item/clothing/head/helmet/space/void/cruiser(src) @@ -80,16 +99,23 @@ new /obj/item/clothing/suit/space/void/cruiser(src) new /obj/item/gun/energy/gun/nuclear(src) new /obj/item/gun/energy/gun/nuclear(src) - new /obj/item/gun/energy/stunrevolver(src) - new /obj/item/gun/energy/stunrevolver(src) + new /obj/item/gun/energy/disruptorpistol/magnum(src) + new /obj/item/gun/energy/disruptorpistol/magnum(src) new /obj/item/gun/energy/net(src) - new /obj/item/gun/energy/lawgiver(src) + new /obj/item/gun/projectile/automatic/x9(src) + new /obj/item/gun/projectile/automatic/x9(src) + new /obj/item/ammo_magazine/c45m/auto(src) + new /obj/item/ammo_magazine/c45m/auto(src) + new /obj/item/ammo_magazine/c45m/auto(src) + new /obj/item/ammo_magazine/c45m/auto(src) /obj/structure/closet/crate/secure/gear_loadout/eridani_single/fill() + new /obj/item/clothing/under/rank/security/pmc/epmc(src) + new /obj/item/clothing/head/beret/corporate/pmc/epmc(src) new /obj/item/clothing/head/helmet/space/void/cruiser(src) new /obj/item/clothing/suit/space/void/cruiser(src) new /obj/item/gun/energy/gun/nuclear(src) - new /obj/item/gun/energy/stunrevolver(src) + new /obj/item/gun/energy/disruptorpistol/magnum(src) /obj/structure/closet/crate/secure/gear_loadout/elyra/fill() new /obj/item/rig/elyran/equipped(src) @@ -274,21 +300,46 @@ new /obj/item/clothing/shoes/magboots(src) /obj/structure/closet/crate/secure/gear_loadout/dominia/fill() + new /obj/item/clothing/under/dominia/fleet(src) + new /obj/item/clothing/under/dominia/fleet(src) + new /obj/item/clothing/under/dominia/fleet(src) + new /obj/item/clothing/under/dominia/fleet/armsman(src) + new /obj/item/clothing/under/dominia/fleet/armsman(src) + new /obj/item/clothing/under/dominia/fleet/officer(src) + new /obj/item/clothing/head/dominia/fleet(src) + new /obj/item/clothing/head/dominia/fleet(src) + new /obj/item/clothing/head/dominia/fleet(src) + new /obj/item/clothing/head/dominia/fleet/armsman(src) + new /obj/item/clothing/head/dominia/fleet/armsman(src) + new /obj/item/clothing/head/dominia/fleet/officer(src) + new /obj/item/clothing/suit/storage/dominia/fleet(src) new /obj/item/rig/jinxiang/equipped(src) new /obj/item/clothing/head/helmet/space/void/dominia(src) new /obj/item/clothing/head/helmet/space/void/dominia(src) new /obj/item/clothing/head/helmet/space/void/dominia(src) new /obj/item/clothing/head/helmet/space/void/dominia(src) new /obj/item/clothing/head/helmet/space/void/dominia(src) - new /obj/item/clothing/head/helmet/space/void/dominia/unathi(src) - new /obj/item/clothing/head/helmet/space/void/dominia/unathi(src) new /obj/item/clothing/suit/space/void/dominia(src) new /obj/item/clothing/suit/space/void/dominia(src) new /obj/item/clothing/suit/space/void/dominia(src) new /obj/item/clothing/suit/space/void/dominia(src) new /obj/item/clothing/suit/space/void/dominia(src) - new /obj/item/clothing/suit/space/void/dominia/unathi(src) - new /obj/item/clothing/suit/space/void/dominia/unathi(src) + new /obj/item/gun/projectile/automatic/rifle/dom(src) + new /obj/item/gun/projectile/automatic/rifle/dom(src) + new /obj/item/ammo_magazine/c762(src) + new /obj/item/ammo_magazine/c762(src) + new /obj/item/ammo_magazine/c762(src) + new /obj/item/ammo_magazine/c762(src) + new /obj/item/gun/projectile/automatic/tommygun/dom(src) + new /obj/item/gun/projectile/automatic/tommygun/dom(src) + new /obj/item/gun/projectile/automatic/tommygun/dom(src) + new /obj/item/ammo_magazine/submachinemag(src) + new /obj/item/ammo_magazine/submachinemag(src) + new /obj/item/ammo_magazine/submachinemag(src) + new /obj/item/ammo_magazine/submachinemag(src) + new /obj/item/ammo_magazine/submachinemag(src) + new /obj/item/ammo_magazine/submachinemag(src) + new /obj/item/melee/energy/sword/pirate(src) new /obj/item/melee/energy/sword/pirate(src) new /obj/item/melee/energy/sword/pirate(src) new /obj/item/melee/energy/sword/pirate(src) @@ -297,18 +348,20 @@ new /obj/item/shield/energy/dominia(src) new /obj/item/shield/energy/dominia(src) new /obj/item/shield/energy/dominia(src) + new /obj/item/shield/energy/dominia(src) + new /obj/item/storage/box/dominianvoid(src) /obj/structure/closet/crate/secure/gear_loadout/dominia/single/fill() + new /obj/item/clothing/under/dominia/fleet(src) + new /obj/item/clothing/under/dominia/fleet/armsman(src) new /obj/item/clothing/head/helmet/space/void/dominia(src) new /obj/item/clothing/suit/space/void/dominia(src) + new /obj/item/gun/projectile/automatic/rifle/dom(src) + new /obj/item/ammo_magazine/c762(src) + new /obj/item/ammo_magazine/c762(src) new /obj/item/melee/energy/sword/pirate(src) new /obj/item/shield/energy/dominia(src) - -/obj/structure/closet/crate/secure/gear_loadout/dominia/single/unathi/fill() - new /obj/item/clothing/head/helmet/space/void/dominia/unathi(src) - new /obj/item/clothing/suit/space/void/dominia/unathi(src) - new /obj/item/melee/energy/sword/pirate(src) - new /obj/item/shield/energy/dominia(src) + new /obj/item/voidsuit_modkit/dominianvoid(src) /obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/fill() new /obj/item/clothing/under/tajaran/cosmonaut(src) @@ -364,6 +417,84 @@ new /obj/item/gun/projectile/pistol/adhomai(src) new /obj/item/ammo_magazine/mc9mm(src) new /obj/item/ammo_magazine/mc9mm(src) + +/obj/structure/closet/crate/secure/gear_loadout/legion/fill() + new /obj/item/clothing/under/legion(src) + new /obj/item/clothing/under/legion(src) + new /obj/item/clothing/under/legion(src) + new /obj/item/clothing/under/legion/sentinel(src) + new /obj/item/clothing/under/legion/sentinel(src) + new /obj/item/clothing/under/legion/legate(src) + new /obj/item/clothing/head/beret/legion/field(src) + new /obj/item/clothing/head/beret/legion/field(src) + new /obj/item/clothing/head/beret/legion/field(src) + new /obj/item/clothing/head/beret/legion/field(src) + new /obj/item/clothing/head/legion/legate(src) + new /obj/item/clothing/head/helmet/legion(src) + new /obj/item/clothing/head/helmet/legion(src) + new /obj/item/clothing/head/helmet/legion(src) + new /obj/item/clothing/head/helmet/legion(src) + new /obj/item/clothing/head/helmet/legion(src) + new /obj/item/clothing/accessory/legion(src) + new /obj/item/clothing/accessory/legion(src) + new /obj/item/clothing/accessory/legion(src) + new /obj/item/clothing/accessory/legion(src) + new /obj/item/clothing/accessory/legion/specialist(src) + new /obj/item/clothing/accessory/legion/specialist(src) + new /obj/item/clothing/accessory/legion/specialist(src) + new /obj/item/rig/retro(src) + new /obj/item/rig/retro(src) + new /obj/item/rig/retro(src) + new /obj/item/rig/retro(src) + new /obj/item/rig/retro(src) + new /obj/item/clothing/suit/storage/vest/legion(src) + new /obj/item/clothing/suit/storage/vest/legion(src) + new /obj/item/clothing/suit/storage/vest/legion(src) + new /obj/item/clothing/suit/storage/vest/legion(src) + new /obj/item/clothing/suit/storage/vest/legion(src) + new /obj/item/storage/backpack/legion(src) + new /obj/item/storage/backpack/legion(src) + new /obj/item/storage/backpack/legion(src) + new /obj/item/storage/backpack/legion(src) + new /obj/item/storage/backpack/legion(src) + new /obj/item/shield/energy/legion(src) + new /obj/item/shield/energy/legion(src) + new /obj/item/shield/energy/legion(src) + new /obj/item/shield/riot/tact/legion(src) + new /obj/item/shield/riot/tact/legion(src) + new /obj/item/gun/energy/blaster/revolver(src) + new /obj/item/gun/energy/blaster/revolver(src) + new /obj/item/gun/energy/blaster/carbine(src) + new /obj/item/gun/energy/blaster/carbine(src) + new /obj/item/gun/projectile/gauss(src) + new /obj/item/gun/projectile/gauss(src) + new /obj/item/ammo_magazine/gauss(src) + new /obj/item/ammo_magazine/gauss(src) + new /obj/item/ammo_magazine/gauss(src) + new /obj/item/ammo_magazine/gauss(src) + new /obj/item/ammo_magazine/gauss(src) + new /obj/item/ammo_magazine/gauss(src) + new /obj/item/ammo_magazine/gauss/emp(src) + new /obj/item/ammo_magazine/gauss/emp(src) + new /obj/item/melee/energy/sword/knife(src) + new /obj/item/melee/energy/sword/knife(src) + new /obj/item/melee/energy/sword/knife(src) + new /obj/item/melee/energy/sword/knife(src) + new /obj/item/material/twohanded/pike/flag(src) + +/obj/structure/closet/crate/secure/gear_loadout/legion/single/fill() + new /obj/item/clothing/under/legion(src) + new /obj/item/clothing/head/beret/legion/field(src) + new /obj/item/clothing/head/helmet/legion(src) + new /obj/item/clothing/accessory/legion(src) + new /obj/item/clothing/accessory/legion/specialist(src) + new /obj/item/rig/retro(src) + new /obj/item/clothing/suit/storage/vest/legion(src) + new /obj/item/storage/backpack/legion(src) + new /obj/item/shield/energy/legion(src) + new /obj/item/gun/energy/blaster/revolver(src) + new /obj/item/gun/energy/blaster/carbine(src) + new /obj/item/melee/energy/sword/knife(src) /obj/structure/closet/crate/secure/gear_loadout/einstein/fill() new /obj/item/rig/merc/einstein(src) diff --git a/html/changelogs/Uplink Gear - GeneralCamo.yml b/html/changelogs/Uplink Gear - GeneralCamo.yml new file mode 100644 index 00000000000..d809bd64157 --- /dev/null +++ b/html/changelogs/Uplink Gear - GeneralCamo.yml @@ -0,0 +1,45 @@ +################################ +# 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: GeneralCamo + +# 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 Tau Ceti Foreign Legion gear crate to the uplink, with their faction's gear." + - balance: "Revamped the Empire of Dominia gear crate to incorporate their new faction items, and add ranged weapons." + - rscadd: "Added modkits to convert dominian prejoroub voidsuits into voidsmens' voidsuits." + - rscdel: "Removed the unathi prejoroub voidsuits from the dominia gear crate (This no longer fits with Dominia's new military lore)." + - tweak: "Replaced the SCC Combipistol in the EPMC's crate with two X7 pistols, replaced their stun revolvers with magnum disruptors, and gave them the EPMC uniforms."