From 6f9572d2e46b4d4ee90d5cfd1e08b6da92ab9e1c Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Thu, 20 Aug 2026 00:18:40 -0400 Subject: [PATCH 1/4] sol --- code/__DEFINES/~zapoc/radio_networks.dm | 1 + modular_zapoc/ert/code/items/leopold_items.dm | 121 ++++++++++++++++++ modular_zapoc/ert/code/leopold_antags.dm | 9 ++ .../ert/code/outfits/leopold_outfits.dm | 38 ++++++ modular_zapoc/ert/code/teams.dm | 6 + .../ert/icons/items/inquisitor_armor.dmi | Bin 0 -> 1275 bytes .../icons/items/inquisitor_armor_onfloor.dmi | Bin 0 -> 734 bytes .../ert/icons/items/inquisitor_armor_worn.dmi | Bin 0 -> 1797 bytes tgstation.dme | 5 + 9 files changed, 180 insertions(+) create mode 100644 code/__DEFINES/~zapoc/radio_networks.dm create mode 100644 modular_zapoc/ert/code/items/leopold_items.dm create mode 100644 modular_zapoc/ert/code/leopold_antags.dm create mode 100644 modular_zapoc/ert/code/outfits/leopold_outfits.dm create mode 100644 modular_zapoc/ert/code/teams.dm create mode 100644 modular_zapoc/ert/icons/items/inquisitor_armor.dmi create mode 100644 modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi create mode 100644 modular_zapoc/ert/icons/items/inquisitor_armor_worn.dmi 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..aa06f10d456d --- /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(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 + +//------------BELT------------ +/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..f691cddd8f0e --- /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 + l_pocket = /obj/item/intel_report + glasses = /obj/item/clothing/glasses/night/thermal + neck = /obj/item/card/hunter + shoes = /obj/item/clothing/shoes/vampire/jackboots/inquisitor + back = /obj/item/storage/belt/inquisitor + belt = /obj/item/gun/ballistic/automatic/darkpack/mp5 + suit_store = /obj/item/gun/ballistic/automatic/pistol/darkpack/deagle + implants = list(/obj/item/implant/explosive) + backpack_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" + belt = /obj/item/gun/ballistic/automatic/darkpack/ar15 + backpack_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 0000000000000000000000000000000000000000..5177f8f4164704e853866629ea6341a610568a7a GIT binary patch literal 1275 zcmVt<80d!JM zQvg8b*k%9#0F-)ESad{Xb7OL8aCB*JZU6vyoQ=>u3d1lAhT+*dg-Q0(zqLzA2pO6y zgcPfhz>dLk-0RmgQ-k@#VNpNP#v+oH%V@Sfp_Fft|3j^d!SGAfx*eMD z13xZ6T?>6NkGcQ=1KdeOK~z|U?U%uh+cpqD?I?cP3VU{sKFJ z(>K1qeG`BwcrDy@z#pVnb`TI5cr6j|?C;<3hhOjB2H^R>x5?@4yMF=z;JazknIv9& z;4j&&!>I>?d?LIxB8!0ZyF2{x?rqrt&)@MA0qlfVBSM6W3a|tfEIMrLLk5uXw02uU z)tbX~5Mb$S$_qD{1|ZeG4TTb$KhLITc`@H_2+8t;(e3>O)>1%Z1Hh0$yLI3W#_sA5 zzKSe+V9bMd4@^HT*jF=p{K&4a?ejK;+!2kQX<@MN*=#))kQ$}lT)WXK7}%_8ba=V@ z0L8@E$~j!5CXQ0i7jmOUVKH^|9r?-ABS&;i>O%DxY2gK7;nyz0_h zh~RcZFrW)K0HkX>lS6)_nETYRN2zXX zz59J($(F0=q`>l8Q3r^or9$C0_>`<%T|y7wD!RSta+_F?E#Ru902o&msfkU(8eCiL zo#eRrmV+gjBMJgF;TwXpdc_-C>3x922 zTs!tK0azVHz`~kiqD|mp4dw{I(7GI7MZE&f*T(^kRS%p*KL!jEKjQ&aBl%}Ez~zDq z<7)UOcW6;l>FbtnDPsY}b9DVvZS3WzWj`puhGZqVDvk7-&nBCyl9k4B!67V{#F8_g z9O<>(IxD#*F)+?+2G;%pE}?``HgO;1vq(^e7@qtg2ZtP!O6REEmtHl`i>y@ lU@$)Nc2*si1OC?+koPu1J88Oa<|+UH002ovPDHLkV1k}{Q=I?+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..29bc0f4c852ef56d7332f4ac4831975e4dbde81e GIT binary patch literal 734 zcmV<40wMj0P)u3d1lAhT+*dg-Q0(zqLzA2pO6y zgcPfhz>dLk-0RmgQ-k@#VNpNP#v+oH%V@Sfp_Fft|3j^d!SGAfx*eMD z13xZ6T?>6NkGcQ=0l!H^K~z|U?Upf4!!Q(vjUyr!BtWW^(Rpc8#wst$!h+f;nHkt4 zyK+|~s`>;-8~`yha{v~&02?zBcfn-DbzdofBTu6E^1>Fj zFgl50;3}aF)nR7|Jv}`>Y^qORrh?T1lEgHcR>nKDoZF^fFv#`D)WrPDL~#hh19AkSqp4K_Ag`xQ27XReGS4#$h9z^ zY|s7R`vUd!>@uNlUU?|8)JG743(u#9WK~#90?Ols@+aL_Jkdq~mo&W#bA%T;2<%%>8OShwY znr!U_J&X(nBYTSN$?*=C`Fd+{z zuYi1Z(0EjUQxP!CgWUWoo}dF{Aq4pxAc>R8XwxcO3ygE%kcCq^AOnwTfA-*j1Z1Am z;Yh#Q^e;LdaseDerw`wdb_($Mc;MsVj2t*u2hLDHc7V=jI=1PfattGEnl7i)bUIxi z{l~vw^=AdFIsh+ZErdgWjfWoU0nh@tm$+Q?=Xr=Qvk2t1ll1z*T${8EI*GM%{u$Vj zio)TUd+Oa1{px{0AP@)y0)apv5C{YUfj}VeCY<2%yU+a?TrTJi!fD^y_g@4s^B=K( z50?6QmVY&x^`!`|t)hn=eN|nXUvL<#_49y~?~}W+-5+%B6D~OddLbZQ z3yie?rW$G~@#{zNvbvps%kDv$N)(at8ZlCYh{zjodAP@)y0)apv5C{Zb56d5Tw-FF?vbnNIYA5k1FD#J1i*Vr8 z-U*&(J-}(!|6qP5z~75t9om4f_D)#(2x+2MJ4?iPO$19Yi{vH(>ByC7SPqINz=`F- zi6+Fg`B^<^^B+YZ9hzqcYww1dW{GzByQM*SJqr@xKZrmo9O*AXIYn_AQ;)wD!K`0< zFN9f70fr73pU88-iXhgN{sM^gLJ2!ysg$k>MFe6s4Q{9dVp(jkk(JUYaQewo0I`ho z)IP=HkdPi_VOpy<;P{&J8$4Upi1CU@b51{N|^2T&7e?DSL8HIkYP`lSjN^vnIPv^mfY zqI?RLlyu~Ph5;wHm(R`Dh>sUx6O6i{q|Ge3c?B4t4p7el8t6a`9R?jeTehy|>%w%~ zq*qd&4!xFxA-ES?>@&z2w?3YnuAIA1ZKw}+c-NFd#8T4XIPq9;jLnD+1OkCTAP@)y z0)apv5C}YhZ4Ddk-nK7i{r&CO)|@;C#w~5W0NWzH+X6p%vq5WJ{;4v7K;WMQ%}FM~ z&vm9`ymJpk$a$u+g0u8-!;t7*RPnYdWaaQC^(LW{#WZrSLf-+Of42ja$P6TOkB!Je zh;R_-eSR;7xU*Gb7et@Atsz45+|rRfQ$mY*K?Z8yRg80>JTbXEIl0BlErh%sNuc&k z#n25$fj}S-2)q|uKL~lKcSrI^M#+IAX&$91U-80ypIl$CfL#=JHa)5Y9=WVUx;0*p zF<5sfucxrLP$2v4B`My z7xjoVnxOF3I!(UXmrqe=N~OXz$775GHWwkW-RshDKy23{+pfj0yh6-AwC!{%yUx|a zAr9DNN;@Jd)2cR~)W{ZZ_GxAIro1{K95gAk>8vU@`SPWw?D1xwZS3th;LaI$BFiWH zI6QfLvEOxoMmk_)n2u(Uuj2sXiv!-Iyf(ppTY-Va1SFrz7y*|CYYTXn5~EwdE+w!7 zxrY?*g=q4a10$E#G(P|y;huw&vn+R4F>q~DFVxCc8T{7?7|ZS5>dFSeiQ00000NkvXXu0mjfT^mf} literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index d816d166eefa..abf43719d30c 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" @@ -8282,6 +8283,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" From 0c63f177c8ff46f4f5ab04dcff544e372e669342 Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Thu, 20 Aug 2026 00:34:29 -0400 Subject: [PATCH 2/4] fixes --- modular_zapoc/ert/code/items/leopold_items.dm | 2 +- modular_zapoc/ert/code/outfits/leopold_outfits.dm | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modular_zapoc/ert/code/items/leopold_items.dm b/modular_zapoc/ert/code/items/leopold_items.dm index aa06f10d456d..82faa615cce8 100644 --- a/modular_zapoc/ert/code/items/leopold_items.dm +++ b/modular_zapoc/ert/code/items/leopold_items.dm @@ -54,7 +54,7 @@ /obj/item/clothing/head/vampire/inquisitor/worn_overlays(mutable_appearance/standing, isinhands, icon_file, bodyshape = NONE) . = ..() if(!isinhands) - . += emissive_appearance(icon, light_mask, src, effect_type = EMISSIVE_BLOOM) + . += emissive_appearance(worn_icon, light_mask, src, effect_type = EMISSIVE_BLOOM) //------------SUIT------------ /obj/item/clothing/suit/vampire/inquisitor diff --git a/modular_zapoc/ert/code/outfits/leopold_outfits.dm b/modular_zapoc/ert/code/outfits/leopold_outfits.dm index f691cddd8f0e..0888f96f2faa 100644 --- a/modular_zapoc/ert/code/outfits/leopold_outfits.dm +++ b/modular_zapoc/ert/code/outfits/leopold_outfits.dm @@ -6,7 +6,6 @@ head = /obj/item/clothing/head/vampire/inquisitor gloves = /obj/item/clothing/gloves/vampire/inquisitor r_pocket = /obj/item/flashlight - l_pocket = /obj/item/intel_report glasses = /obj/item/clothing/glasses/night/thermal neck = /obj/item/card/hunter shoes = /obj/item/clothing/shoes/vampire/jackboots/inquisitor From 0985e5e08cb7d49d2cf449c5c60da6c00bef4594 Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Fri, 21 Aug 2026 21:20:29 -0400 Subject: [PATCH 3/4] FINE --- modular_zapoc/ert/code/items/leopold_items.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modular_zapoc/ert/code/items/leopold_items.dm b/modular_zapoc/ert/code/items/leopold_items.dm index 82faa615cce8..e9062bbd07d6 100644 --- a/modular_zapoc/ert/code/items/leopold_items.dm +++ b/modular_zapoc/ert/code/items/leopold_items.dm @@ -100,12 +100,12 @@ ONFLOOR_ICON_HELPER('modular_zapoc/ert/icons/items/inquisitor_armor_onfloor.dmi') armor_type = /datum/armor/clothing_under/security_head_of_security -//------------BELT------------ +//------------BACKPACK------------ /datum/storage/inquisitor_belt // Should supplant backpacks but not replace max_total_storage = 14 max_slots = 21 -/obj/item/storage/belt/inquisitor +/obj/item/storage/backpack/inquisitor name = "harness" desc = "A belt and carrier rig. Silver and cold iron buckshot should do the trick." icon_state = "belt" @@ -113,6 +113,7 @@ 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') + equip_sound = 'sound/items/equip/toolbelt_equip.ogg' storage_type = /datum/storage/inquisitor_belt slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK From 493b3fd25dba1816ae4fe2caa223840c9f8105f5 Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Fri, 21 Aug 2026 22:46:54 -0400 Subject: [PATCH 4/4] pickle from baki --- modular_zapoc/ert/code/items/leopold_items.dm | 3 +-- modular_zapoc/ert/code/outfits/leopold_outfits.dm | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modular_zapoc/ert/code/items/leopold_items.dm b/modular_zapoc/ert/code/items/leopold_items.dm index e9062bbd07d6..5f2b4b47ee22 100644 --- a/modular_zapoc/ert/code/items/leopold_items.dm +++ b/modular_zapoc/ert/code/items/leopold_items.dm @@ -105,7 +105,7 @@ max_total_storage = 14 max_slots = 21 -/obj/item/storage/backpack/inquisitor +/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" @@ -113,7 +113,6 @@ 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') - equip_sound = 'sound/items/equip/toolbelt_equip.ogg' storage_type = /datum/storage/inquisitor_belt slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK diff --git a/modular_zapoc/ert/code/outfits/leopold_outfits.dm b/modular_zapoc/ert/code/outfits/leopold_outfits.dm index 0888f96f2faa..9faddb298583 100644 --- a/modular_zapoc/ert/code/outfits/leopold_outfits.dm +++ b/modular_zapoc/ert/code/outfits/leopold_outfits.dm @@ -8,12 +8,13 @@ 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 - back = /obj/item/storage/belt/inquisitor - belt = /obj/item/gun/ballistic/automatic/darkpack/mp5 + 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) - backpack_contents = list( + belt_contents = list( /obj/item/ammo_box/magazine/darkpack9mp5 = 6, /obj/item/intel_report = 1, /obj/item/ammo_box/magazine/m44 = 3, @@ -25,8 +26,8 @@ /datum/outfit/job/vampire/leopold_ert/leader name = "Society of Leopold Heavy Inquisitor Leader" - belt = /obj/item/gun/ballistic/automatic/darkpack/ar15 - backpack_contents = list( + 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,