diff --git a/code/__DEFINES/~zapoc/radio_networks.dm b/code/__DEFINES/~zapoc/radio_networks.dm new file mode 100644 index 000000000000..115ff48c2925 --- /dev/null +++ b/code/__DEFINES/~zapoc/radio_networks.dm @@ -0,0 +1 @@ +#define NETWORK_LEOPOLD "Society of Leopold Network" diff --git a/modular_zapoc/ert/code/items/leopold_items.dm b/modular_zapoc/ert/code/items/leopold_items.dm new file mode 100644 index 000000000000..5f2b4b47ee22 --- /dev/null +++ b/modular_zapoc/ert/code/items/leopold_items.dm @@ -0,0 +1,121 @@ +//------------EQUIPMENT------------ +/datum/armor/inquisitor + melee = 60 + bullet = 60 + laser = 60 + energy = 60 + fire = 60 + bomb = 60 + acid = 60 + wound = 60 + +//------------SHOES------------ +/obj/item/clothing/shoes/vampire/jackboots/inquisitor + name = "sabatons" + desc = "Armored footwear. These are the roads that burnt our boots." + icon = 'modular_zapoc/ert/icons/items/inquisitor_armor.dmi' + worn_icon = 'modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi' + icon_state = "shoes" + ONFLOOR_ICON_HELPER('modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi') + undyeable = TRUE + armor_type = /datum/armor/shoes_jackboots + +//------------GLOVES------------ +/obj/item/clothing/gloves/vampire/inquisitor + name = "gauntlets" + desc = "Armored gloves. With these hands I will destroy, with these hands I will rebuild." + icon = 'modular_zapoc/ert/icons/items/inquisitor_armor.dmi' + worn_icon = 'modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi' + ONFLOOR_ICON_HELPER('modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi') + icon_state = "gloves" + undyeable = TRUE + armor_type = /datum/armor/gloves_combat + +//------------HELMET------------ +/obj/item/clothing/head/vampire/inquisitor // TODO: TG PR to move NVG of of /clothing/glasses + name = "great helm" + desc = "A black helmet with 4 glowing eyes. God forgives. You do not." + icon_state = "helm" + icon = 'modular_zapoc/ert/icons/items/inquisitor_armor.dmi' + worn_icon = 'modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi' + ONFLOOR_ICON_HELPER('modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi') + armor_type = /datum/armor/inquisitor + undyeable = TRUE + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR + visor_flags_inv = HIDEFACE|HIDESNOUT + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + var/light_mask = "helm_emissive" + +/obj/item/clothing/head/vampire/inquisitor/update_overlays() + . = ..() + . += emissive_appearance(icon, light_mask, src, effect_type = EMISSIVE_BLOOM) + +/obj/item/clothing/head/vampire/inquisitor/worn_overlays(mutable_appearance/standing, isinhands, icon_file, bodyshape = NONE) + . = ..() + if(!isinhands) + . += emissive_appearance(worn_icon, light_mask, src, effect_type = EMISSIVE_BLOOM) + +//------------SUIT------------ +/obj/item/clothing/suit/vampire/inquisitor + name = "cuirass" + desc = "A strong looking, armoured-vest. No weapon formed against you shall prosper." + icon_state = "suit" + icon = 'modular_zapoc/ert/icons/items/inquisitor_armor.dmi' + worn_icon = 'modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi' + ONFLOOR_ICON_HELPER('modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi') + armor_type = /datum/armor/inquisitor + undyeable = TRUE + max_integrity = 250 + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED) + allowed = list( + /obj/item/card, + /obj/item/flashlight, + /obj/item/melee/baton, + /obj/item/restraints/handcuffs, + /obj/item/intel_report, + /obj/item/ammo_box/magazine/darkpack9mp5, + /obj/item/intel_report, + /obj/item/ammo_box/magazine/m44, + /obj/item/vampire_stake, + /obj/item/vampirebook/bible, + /obj/item/card/credit, + /obj/item/storage/medkit/darkpack/ifak, + /obj/item/gun/ballistic/automatic/darkpack/mp5, + /obj/item/gun/ballistic/automatic/pistol/darkpack/deagle, + /obj/item/storage/belt/inquisitor, + ) + +//------------UNDER------------ +/obj/item/clothing/under/vampire/inquisitor + name = "gambeson" + desc = "A heavily padded jumpsuit. They will fight against you but will never overcome you." + icon_state = "under" + undyeable = TRUE + icon = 'modular_zapoc/ert/icons/items/inquisitor_armor.dmi' + worn_icon = 'modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi' + ONFLOOR_ICON_HELPER('modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi') + armor_type = /datum/armor/clothing_under/security_head_of_security + +//------------BACKPACK------------ +/datum/storage/inquisitor_belt // Should supplant backpacks but not replace + max_total_storage = 14 + max_slots = 21 + +/obj/item/storage/belt/inquisitor + name = "harness" + desc = "A belt and carrier rig. Silver and cold iron buckshot should do the trick." + icon_state = "belt" + worn_icon_state = "belt" + icon = 'modular_zapoc/ert/icons/items/inquisitor_armor.dmi' + worn_icon = 'modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi' + ONFLOOR_ICON_HELPER('modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi') + storage_type = /datum/storage/inquisitor_belt + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK + +//----------EQUIPMENT---------- +/obj/item/radio/headset/darkpack/inquisitor + radio_network = NETWORK_LEOPOLD diff --git a/modular_zapoc/ert/code/leopold_antags.dm b/modular_zapoc/ert/code/leopold_antags.dm new file mode 100644 index 000000000000..fbd7f700a1d0 --- /dev/null +++ b/modular_zapoc/ert/code/leopold_antags.dm @@ -0,0 +1,9 @@ +/datum/antagonist/ert/darkpack/leopold + name = "Heavy Inquisitor" + outfit = /datum/outfit/job/vampire/leopold_ert + role = "Inquisitor" + +/datum/antagonist/ert/darkpack/leopold/leader + name = "Heavy Inquisitor Leader" + outfit = /datum/outfit/job/vampire/leopold_ert/leader + role = "Inquisitor Team Leader" diff --git a/modular_zapoc/ert/code/outfits/leopold_outfits.dm b/modular_zapoc/ert/code/outfits/leopold_outfits.dm new file mode 100644 index 000000000000..9faddb298583 --- /dev/null +++ b/modular_zapoc/ert/code/outfits/leopold_outfits.dm @@ -0,0 +1,38 @@ +/datum/outfit/job/vampire/leopold_ert + name = "Society of Leopold Heavy Inquisitor" + ears = /obj/item/radio/headset/darkpack/inquisitor + uniform = /obj/item/clothing/under/vampire/inquisitor + suit = /obj/item/clothing/suit/vampire/inquisitor + head = /obj/item/clothing/head/vampire/inquisitor + gloves = /obj/item/clothing/gloves/vampire/inquisitor + r_pocket = /obj/item/flashlight + glasses = /obj/item/clothing/glasses/night/thermal + neck = /obj/item/card/hunter + back = null + shoes = /obj/item/clothing/shoes/vampire/jackboots/inquisitor + belt = /obj/item/storage/belt/inquisitor + r_hand = /obj/item/gun/ballistic/automatic/darkpack/mp5 + suit_store = /obj/item/gun/ballistic/automatic/pistol/darkpack/deagle + implants = list(/obj/item/implant/explosive) + belt_contents = list( + /obj/item/ammo_box/magazine/darkpack9mp5 = 6, + /obj/item/intel_report = 1, + /obj/item/ammo_box/magazine/m44 = 3, + /obj/item/vampire_stake = 1, + /obj/item/vampirebook/bible = 1, + /obj/item/card/credit = 1, + /obj/item/storage/medkit/darkpack/ifak = 1, + ) + +/datum/outfit/job/vampire/leopold_ert/leader + name = "Society of Leopold Heavy Inquisitor Leader" + r_hand = /obj/item/gun/ballistic/automatic/darkpack/ar15 + belt_contents = list( + /obj/item/ammo_box/magazine/darkpack556 = 6, + /obj/item/intel_report = 1, + /obj/item/ammo_box/magazine/m44 = 3, + /obj/item/vampire_stake = 1, + /obj/item/vampirebook/bible = 1, + /obj/item/card/credit = 1, + /obj/item/storage/medkit/darkpack/ifak = 1, + ) diff --git a/modular_zapoc/ert/code/teams.dm b/modular_zapoc/ert/code/teams.dm new file mode 100644 index 000000000000..78596c64e631 --- /dev/null +++ b/modular_zapoc/ert/code/teams.dm @@ -0,0 +1,6 @@ +/datum/ert/darkpack/leopold + leader_role = /datum/antagonist/ert/darkpack/leopold/leader + roles = list(/datum/antagonist/ert/darkpack/swat/medic, /datum/antagonist/ert/darkpack/swat/rifleman, /datum/antagonist/ert/darkpack/swat/negotiations) + rename_team = "Society of Leopold Inquisition Strike-force" + mission = "Annihilate any and all soldiers of the Anti-christ's army. The Lord gives you strength." + polldesc = "a Society of Leopold Heavy Inquisitor team" diff --git a/modular_zapoc/ert/icons/items/inquisitor_armor.dmi b/modular_zapoc/ert/icons/items/inquisitor_armor.dmi new file mode 100644 index 000000000000..5177f8f41647 Binary files /dev/null and b/modular_zapoc/ert/icons/items/inquisitor_armor.dmi differ diff --git a/modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi b/modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi new file mode 100644 index 000000000000..29bc0f4c852e Binary files /dev/null and b/modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi differ diff --git a/modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi b/modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi new file mode 100644 index 000000000000..ebbae43cd77c Binary files /dev/null and b/modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 3335b5e73014..4de397ce852b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -503,6 +503,7 @@ #include "code\__DEFINES\~darkpack\traits\sources.dm" #include "code\__DEFINES\~zapoc\factions.dm" #include "code\__DEFINES\~zapoc\jobs.dm" +#include "code\__DEFINES\~zapoc\radio_networks.dm" #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_dreamluau.dm" #include "code\__HELPERS\_level_traits.dm" @@ -8304,6 +8305,10 @@ #include "modular_darkpack\modules\z_travel\code\helpers.dm" #include "modular_darkpack\modules\z_travel\code\manhole.dm" #include "modular_darkpack\modules\z_travel\code\transfer_point.dm" +#include "modular_zapoc\ert\code\leopold_antags.dm" +#include "modular_zapoc\ert\code\teams.dm" +#include "modular_zapoc\ert\code\items\leopold_items.dm" +#include "modular_zapoc\ert\code\outfits\leopold_outfits.dm" #include "modular_zapoc\master_files\code\controllers\configuration\entries\general.dm" #include "modular_zapoc\master_files\code\game\objects\structures\stairs.dm" #include "modular_zapoc\master_files\code\modules\discord\tgs_commands.dm"