diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index 9154b6d7f2f..4bc6b60da64 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -203,3 +203,14 @@ desc = "A crate containing gear for a single individual." path = /obj/structure/closet/crate/secure/gear_loadout/tcaf/single telecrystal_cost = 10 + +/datum/uplink_item/item/gear_loadout/exclusionist + name = "Exclusionist Assets (Group)" + desc = "A crate containing gear for a group." + path = /obj/structure/closet/crate/secure/gear_loadout/exclusionist + +/datum/uplink_item/item/gear_loadout/exclusionist_single + name = "Exclusionist Assets (Single)" + desc = "A crate containing gear for a single individual." + path = /obj/structure/closet/crate/secure/gear_loadout/exclusionist/single + telecrystal_cost = 10 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 22ea0c8df94..3568e0d05a3 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -1033,6 +1033,39 @@ new /obj/item/gun/energy/blaster/tcaf(src) new /obj/item/storage/belt/military(src) +/obj/structure/closet/crate/secure/gear_loadout/exclusionist/fill() + new /obj/item/clothing/under/gearharness(src) + new /obj/item/clothing/under/gearharness(src) + new /obj/item/clothing/under/gearharness(src) + new /obj/item/clothing/under/gearharness(src) + new /obj/item/clothing/under/gearharness(src) + new /obj/item/clothing/suit/armor/exclusionist(src) + new /obj/item/clothing/suit/armor/exclusionist(src) + new /obj/item/clothing/suit/armor/exclusionist(src) + new /obj/item/clothing/suit/armor/exclusionist(src) + new /obj/item/clothing/suit/armor/exclusionist(src) + new /obj/item/clothing/mask/exclusionist(src) + new /obj/item/clothing/mask/exclusionist(src) + new /obj/item/clothing/mask/exclusionist(src) + new /obj/item/clothing/mask/exclusionist(src) + new /obj/item/clothing/mask/exclusionist(src) + new /obj/item/clothing/ears/antenna/trinary_halo/exclusionist(src) + new /obj/item/clothing/ears/antenna/trinary_halo/exclusionist(src) + new /obj/item/clothing/ears/antenna/trinary_halo/exclusionist(src) + new /obj/item/clothing/ears/antenna/trinary_halo/exclusionist(src) + new /obj/item/clothing/ears/antenna/trinary_halo/exclusionist(src) + new /obj/item/melee/chainsword(src) + new /obj/item/melee/chainsword(src) + new /obj/item/melee/chainsword(src) + new /obj/item/melee/chainsword(src) + +/obj/structure/closet/crate/secure/gear_loadout/exclusionist/single/fill() + new /obj/item/clothing/under/gearharness(src) + new /obj/item/clothing/suit/armor/exclusionist(src) + new /obj/item/clothing/mask/exclusionist(src) + new /obj/item/clothing/ears/antenna/trinary_halo/exclusionist(src) + new /obj/item/melee/chainsword(src) + //ninja stuff /obj/structure/closet/crate/secure/gear_loadout/ninja var/associated_hardsuit = /obj/item/rig/light/ninja diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index de8e6b34831..12677dc82b5 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -3112,6 +3112,46 @@ /obj/structure/sign/flag/traditionalist/large/west/Initialize(mapload) . = ..(mapload, WEST) +//Exclusionists +/obj/item/flag/exclusionist + name = "\improper Exclusionist flag" + desc = "The gold and black flag of the Exclusionists, a heretical and extremist sect of the Trinary Perfection." + flag_path = "exclusionist" + flag_structure = /obj/structure/sign/flag/exclusionist + +/obj/structure/sign/flag/exclusionist + name = "\improper Exclusionist flag" + desc = "The gold and black flag of the Exclusionists, a heretical and extremist sect of the Trinary Perfection." + flag_path = "exclusionist" + icon_state = "exclusionist" + flag_item = /obj/item/flag/exclusionist + +/obj/structure/sign/flag/exclusionist/unmovable + unmovable = TRUE + +/obj/item/flag/exclusionist/l + name = "large Exclusionist flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/exclusionist/large + +/obj/structure/sign/flag/exclusionist/large + icon_state = "exclusionist_l" + flag_path = "exclusionist" + flag_size = TRUE + flag_item = /obj/item/flag/exclusionist/l + +/obj/structure/sign/flag/exclusionist/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/exclusionist/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/exclusionist/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/exclusionist/large/west/Initialize(mapload) + . = ..(mapload, WEST) + // Callisto /obj/item/flag/callisto diff --git a/code/modules/clothing/factions/trinary.dm b/code/modules/clothing/factions/trinary.dm index 2e95496ea5e..91599f5d44f 100644 --- a/code/modules/clothing/factions/trinary.dm +++ b/code/modules/clothing/factions/trinary.dm @@ -22,3 +22,68 @@ icon_state = "trinary_coif" item_state = "trinary_coif" contained_sprite = TRUE + +//Exclusionist Gear +/obj/item/clothing/suit/storage/hooded/exclusionist_robe + name = "exclusionist robes" + desc = "Red and gold robes worn by those who follow the Exclusionist heresy of the Trinary Perfection." + icon = 'icons/clothing/suits/exclusionist_robes.dmi' + icon_state = "exclusionist_robe_priest" + item_state = "exclusionist_robe_priest" + hoodtype = /obj/item/clothing/head/winterhood/exclusionist + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/hooded/exclusionist_robe/warpriest + name = "exclusionist warpriest's robe" + desc = "Black and gold robes worn by those who follow the Exclusionist heresy of the Trinary Perfection." + icon_state = "exclusionist_robe_warpriest" + item_state = "exclusionist_robe_warpriest" + hoodtype = /obj/item/clothing/head/winterhood/exclusionist/warpriest + +/obj/item/clothing/head/winterhood/exclusionist + name = "exclusionist hood" + desc = "A red and gold hood worn by those who follow the Exclusionist heresy of the Trinary Perfection." + icon = 'icons/clothing/suits/exclusionist_robes.dmi' + icon_state = "exclusionist_robe_priest_hood" + item_state = "exclusionist_robe_priest_hood" + +/obj/item/clothing/head/winterhood/exclusionist/warpriest + name = "exclusionist warpriest's hood" + desc = "A black and gold hood worn by those who follow the Exclusionist heresy of the Trinary Perfection." + icon_state = "exclusionist_robe_warpriest_hood" + item_state = "exclusionist_robe_warpriest_hood" + +/obj/item/clothing/ears/antenna/trinary_halo/exclusionist + color = "#1c1c1c" + +/obj/item/clothing/suit/armor/exclusionist + name = "armored exclusionist robe" + desc = "Robes worn by those who follow the Exclusionist heresy of the Trinary Perfection. These ones seem to have been reinforced for battle." + icon = 'icons/clothing/suits/exclusionist_robes.dmi' + icon_state = "exclusionist_armored_robe" + item_state = "exclusionist_armored_robe" + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_RIFLE, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + ) + contained_sprite = TRUE + slowdown = 1 + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + +/obj/item/clothing/mask/exclusionist + name = "exclusionist mask" + desc = "A fearsome steel mask, worn by those who follow the Exclusionist heresy of the Trinary Perfection." + icon = 'icons/clothing/suits/exclusionist_robes.dmi' + icon_state = "exclusionist_mask" + item_state = "exclusionist_mask" + contained_sprite = TRUE + armor = list( + melee = ARMOR_MELEE_SMALL, + bullet = ARMOR_BALLISTIC_SMALL, + laser = ARMOR_LASER_MINOR, + bio = ARMOR_BIO_STRONG + ) + flash_protection = FLASH_PROTECTION_MODERATE diff --git a/html/changelogs/RustingWithYou - excludesyou.yml b/html/changelogs/RustingWithYou - excludesyou.yml new file mode 100644 index 00000000000..8896259fafa --- /dev/null +++ b/html/changelogs/RustingWithYou - excludesyou.yml @@ -0,0 +1,41 @@ +################################ +# 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: RustingWithYou + +# 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: "Adds Exclusionist items and flags." diff --git a/icons/clothing/suits/exclusionist_robes.dmi b/icons/clothing/suits/exclusionist_robes.dmi new file mode 100644 index 00000000000..635bde8ab8c Binary files /dev/null and b/icons/clothing/suits/exclusionist_robes.dmi differ diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 8deb014f66a..f3fdf6c638f 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ