diff --git a/aurorastation.dme b/aurorastation.dme index 333a2bfe8ef..6d0dfec5fdf 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -318,8 +318,8 @@ #include "code\datums\outfits\ert\nt_ert.dm" #include "code\datums\outfits\ert\syndicate.dm" #include "code\datums\outfits\ert\tcfl.dm" +#include "code\datums\outfits\event\outfit_events.dm" #include "code\datums\outfits\event\outfit_killers.dm" -#include "code\datums\outfits\event\outfit_lance.dm" #include "code\datums\outfits\event\outfit_megacorps.dm" #include "code\datums\outfits\event\outfit_nanotrasen.dm" #include "code\datums\outfits\event\outfit_tfcl.dm" diff --git a/code/datums/outfits/event/outfit_lance.dm b/code/datums/outfits/event/outfit_events.dm similarity index 63% rename from code/datums/outfits/event/outfit_lance.dm rename to code/datums/outfits/event/outfit_events.dm index 2157575c584..19ba1523328 100644 --- a/code/datums/outfits/event/outfit_lance.dm +++ b/code/datums/outfits/event/outfit_events.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/lance +/datum/outfit/admin/event/lance name = "Lancer" uniform = /obj/item/clothing/under/lance @@ -23,10 +23,10 @@ ) var/id_access = "Lancer" -/datum/outfit/admin/lance/get_id_access() +/datum/outfit/admin/event/lance/get_id_access() return get_syndicate_access(id_access) -/datum/outfit/admin/lance/engineer +/datum/outfit/admin/event/lance/engineer name = "Lance Engineer" uniform = /obj/item/clothing/under/lance @@ -50,7 +50,7 @@ ) id_access = "Lance Engineer" -/datum/outfit/admin/lance/medic +/datum/outfit/admin/event/lance/medic name = "Lance Medic" uniform = /obj/item/clothing/under/lance @@ -77,7 +77,7 @@ accessory_contents = list(/obj/item/gun/energy/pulse/pistol = 1) id_access = "Lance Medic" -/datum/outfit/admin/lance/operative +/datum/outfit/admin/event/lance/operative name = "Lance Operative" uniform = /obj/item/clothing/under/dress/lance_dress/male @@ -100,4 +100,57 @@ belt_contents = list( /obj/item/device/multitool = 1 ) - id_access = "Lance Operative" \ No newline at end of file + id_access = "Lance Operative" + +/datum/outfit/admin/event/sol_marine + name = "Solarian Marine" + + uniform = /obj/item/clothing/under/rank/fatigues + shoes = /obj/item/clothing/shoes/magboots + gloves = /obj/item/clothing/gloves/combat + l_ear = /obj/item/device/radio/headset/syndicate + glasses = /obj/item/clothing/glasses/thermal + l_pocket = /obj/item/tank/emergency_oxygen/double + r_pocket = /obj/item/crowbar/red + id = /obj/item/card/id/syndicate + head = /obj/item/clothing/head/helmet/space/void/sol + suit = /obj/item/clothing/suit/space/void/sol + mask = /obj/item/clothing/mask/gas/tactical + back = /obj/item/tank/jetpack/carbondioxide + suit_store = /obj/item/gun/projectile/automatic/rifle/sol + + belt = /obj/item/storage/belt/military + belt_contents = list( + /obj/item/ammo_magazine/c762/sol = 3, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/shield/energy = 1, + /obj/item/melee/energy/sword = 1, + /obj/item/grenade/frag = 1, + /obj/item/grenade/flashbang = 1 + ) + + + accessory = /obj/item/clothing/accessory/holster/hip/brown + accessory_contents = list(/obj/item/gun/projectile/pistol/sol = 1) + +/datum/outfit/admin/event/sol_marine/heavy + name = "Heavy Solarian Marine" + + head = null + suit = null + mask = /obj/item/clothing/mask/gas/tactical + back = /obj/item/rig/military/equipped + belt_contents = list( + /obj/item/gun/projectile/pistol/sol = 1, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/shield/energy = 1, + /obj/item/melee/energy/sword = 1, + /obj/item/grenade/frag = 2, + /obj/item/grenade/flashbang = 2 + ) + + l_hand = /obj/item/gun/projectile/shotgun/pump/combat/sol + + accessory = /obj/item/clothing/accessory/storage/bandolier + accessory_contents = list(/obj/item/ammo_casing/shotgun = 8, + /obj/item/ammo_casing/shotgun/pellet = 8) \ No newline at end of file diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 7f28db208a3..0e1520d12fd 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -321,7 +321,7 @@ if("Admin") outfit_catagories["NanoTrasen"] = typesof(/datum/outfit/admin/nt) outfit_catagories["Antagonist"] = typesof(/datum/outfit/admin/syndicate) - outfit_catagories["Ceres Lance"] = typesof(/datum/outfit/admin/lance) + outfit_catagories["Event"] = typesof(/datum/outfit/admin/event) outfit_catagories["TCFL"] = typesof(/datum/outfit/admin/tcfl) outfit_catagories["Killers"] = typesof(/datum/outfit/admin/killer) outfit_catagories["Job"] = subtypesof(/datum/outfit/job) diff --git a/html/changelogs/alberyk-solstuff.yml b/html/changelogs/alberyk-solstuff.yml new file mode 100644 index 00000000000..b93a436e810 --- /dev/null +++ b/html/changelogs/alberyk-solstuff.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - imageadd: "Added new sprites for the battle rifle and the naval shotgun." diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 40ed8e12c33..9c8d540d850 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/battlerifle.dmi b/icons/obj/guns/battlerifle.dmi index 15e07b545ed..5773a98cdcf 100644 Binary files a/icons/obj/guns/battlerifle.dmi and b/icons/obj/guns/battlerifle.dmi differ diff --git a/icons/obj/guns/malella.dmi b/icons/obj/guns/malella.dmi index f29e002bc38..77e8b1f7158 100644 Binary files a/icons/obj/guns/malella.dmi and b/icons/obj/guns/malella.dmi differ