From d6a5bf01994956eec3ea6fcfcd9c08fe433968de Mon Sep 17 00:00:00 2001 From: Fullonibus <38350888+Fullonibus@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:46:26 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=95=D0=A0=D0=A2=20=D0=B0=D0=B2=D1=82?= =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D1=82=D0=BE=D0=B2,=20=D0=A1=D0=A0=D0=A2,=20?= =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D1=89=20=D1=81=D0=B8=D0=BD=D0=B4=D0=B8=20?= =?UTF-8?q?=D0=BE=D1=84=D0=B8=D1=86=D0=B5=D1=80=D0=B0,=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B2=D0=BE=D0=BB=D1=8C=D0=B2=D0=B5=D1=80=D1=8B=20=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=BE=D0=B2=20(#446)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Изменение оснащения ЕРТ автоматов уровня Амбер, Гамма, Эпсилон. Добавлен аутфит СРТ, куртка офицера Синдиката, замена револьверов у командного состава СССП -Амбер получили вместо тазеров дизейблеры и больше резины в свои автоматы. -Гамма получила вместо ARG - SMG и бронебойные патроны к нему в свои автоматы. -[Данные Удалены] получили в свою оружейную B.S.G. -Добавлен аутфит в меню админ спавна - Special Response Team Member. -Офицер Синдиката получил из химчистки свою куртку. Теперь он выглядит не как трудовик в алкашке, а как трудовик в крутой куртке. - рш12 и Анаконда теперь стоят на вооружении офицерского состава СССП. Fixes #410 ## Почему это хорошо для игры Баланс ЕРТ, немного удобства щитспавну админам, ввод в игру новое вооружение. ## Изображения изменений ![image](https://github.com/ss220club/Paradise-SS220/assets/38350888/fb22e51b-3309-4c5f-9709-3b56ef348602) ![image](https://github.com/ss220club/Paradise-SS220/assets/38350888/931bb6dc-1772-4247-b967-090a66d07b1c) ## Тестирование Автоматы работают, СРТ прохлаждаются, офицер Синдиката ходит довольный в своей куртке, капитан СССП ставит свечку на точность своей анаконды. ## Changelog :cl: add: Special Response Team Member tweak: Syndicate Officer drip tweak: Наполнение автоматов ЕРТ tweak: Замена револьверов у офицеров СССП /:cl: --------- Co-authored-by: dj-34 Co-authored-by: Furior <68264134+Furrior@users.noreply.github.com> --- modular_ss220/clothing/code/suits.dm | 8 ++ modular_ss220/clothing/icons/mob/suits.dmi | Bin 3083 -> 7760 bytes modular_ss220/clothing/icons/object/suits.dmi | Bin 1270 -> 2973 bytes modular_ss220/modular_ss220.dme | 3 +- modular_ss220/objects/code/weapons.dm | 1 + modular_ss220/outfits/_outfits.dm | 4 + modular_ss220/outfits/_outfits.dme | 3 + modular_ss220/outfits/code/outfits.dm | 92 ++++++++++++++++++ modular_ss220/vending/code/vending.dm | 13 ++- 9 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 modular_ss220/outfits/_outfits.dm create mode 100644 modular_ss220/outfits/_outfits.dme create mode 100644 modular_ss220/outfits/code/outfits.dm diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm index 44f1a3a63e2a..c184c4af2d7c 100644 --- a/modular_ss220/clothing/code/suits.dm +++ b/modular_ss220/clothing/code/suits.dm @@ -80,3 +80,11 @@ name = "светло-голубой акулий капюшон" icon_state = "shark_casual_light" item_state = "shark_casual_light" + +/obj/item/clothing/suit/space/deathsquad/officer/syndie + name = "куртка офицера синдиката" + desc = "Длинная куртка из высокопрочного волокна." + icon = 'modular_ss220/clothing/icons/object/suits.dmi' + icon_state = "jacket_syndie" + icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' + item_state = "jacket_syndie" diff --git a/modular_ss220/clothing/icons/mob/suits.dmi b/modular_ss220/clothing/icons/mob/suits.dmi index 6e6bbff67d3923dfebb2d94de4bff493a72cf542..ef67e36af000887840ff29c2eb47e4fb0f8786ab 100644 GIT binary patch literal 7760 zcmbW6XHXMN*Y`sLgkm5xQCdQgB8sSVghYyfN>da?AQTml-g^Q_2{j-JND%~4q{~G& zbdV+lM5F`(X+e6Z354)+-81jEd!Cu+`LMgQJ7;!hch33GIlqlHG17yu39tbG0EmIU z&b`yI_20(AeA?feasi(Xl|g2Yd~}|9+j}{A_&B+{0RREnIVoQ`Udo@*B`wH`jh8h4 zlH)6~lWu`Fbh`ckqzGwu&G7dPedhN0YObc2wr-ZQbH}uJ&7wy{rg5k^Rn4vT9zNSv zJ*~rpC-iXX9Y`9zCsrBTl_i2`0twTXi&nnw0)7({Tcv3_=$ne zO|yXPbu0GQmb!1td!JtGUAP*EfU`0y$l?|&&v{(vd(7JltP*qQdZaHAFUCCwv`v2# zcGIpEX=9pZ4`p>{nPaOTmKL&%U|jI1>S>e?zahWSCUMeCVY%$pm3cKBo4P|bJmVxD6-UmZ0MN!1;v1a~%~G-f|+e@;nn z;kN=yp+6v3BTkB4!q0$^ccC<&d7zP9V2SGvT_fml7ZBi(5ROCa!!H}FA*TmWk) z?i!27kD{A%+XR|^bh zo+eBbKY+j##wkIQ;(#Dz@l?mg6VZ(uf9q{#lrarjc*Um5#BY_qkD!R@JBpPh(>TEJ zFexW^KQ_jEotp$xMY?gitYu~Jv~p~Lo`NW>a%<;Knq*YD$2Ti9>K%EJo5t-i$T8GW zCeMGaQX|>6yeOyfyps2vbweTU?D~xFxH-*IL}rT$~jl)>2t{y|xOr z%k>zz>-x$jpZ6zS_2z_h{*4SDJ``)2D$juKNh z2}U`VK9+^Fi_m+?L;5z*d^Lf_Y;e)o$1Tp;+6I=6%4!x<-Mw<&{Q5`0F5eTCl3-hH zzSCnpi(kIh`T(LWBsg3U)zQhn$Rx)ogxjI`-sS4TapjTkbTb=m?M_2925Z`2Q3Lsp zCnLvTlLAa+=ug)ymU%J3tq518VRsusio|V8+eKTFd7t|c?UgscioEr%XLm}421R6t zxo_gBH&$sE+dD%k$r^)!)EcTZz)b}JcEL}HN$KpieS_%s=M^Gl8RZSi4 z8FbrGxkQtvK>KHB-Gx`jW5RUP0E&QckTu1eV|SZG*a>{!VBHdwUo zggwYIB(lgiz}J_VM0Q|NqBzy)L82VhIa-b~3Zs#O8*>KULh3B#Yr}k)pY+?X$SAUR zN{nmPwxDX5fcqe2NmcTb`I&T{yTTtdfLuSSU%sn~enSiaJdAr;akLX-Z(92%;^bxm z!);ZYSA%cUgo|4_LK`Sqv7U_Qx}z&e0MCX{mZ#WiJyETi@f2nkwaopo_Zl}|aA`7b z_bA{&0Z#>{8E#yI{Ey1{U(B?RR)=g`z`k$Urx{0GvRt!+yWgg?(1Tol{m8^Sqz}>6 z6pU5+M(jUaR**x#QzPm|+i{~ZhHkI_Gk{{7X8mrn8w^lfb<0eGUI=L|q_A2#7VbC9 zU12gefpl&Ogdv037$X&RPa#n-{7w$cJc}Tk~h)=`OwH zwyp{Y!YImItYSHwYS?=6gU?WbOhIX``skaMKRvGHE*F0}{Ojj>Ly<%S7;7&Ll1buMz1 zz^1`5*Gvl`vAZl4ts zH(+OD0z0s3>N)%7tfRz7HL1MvySHwxL$RGW%f#)jYfL2?9^58f#(thpWV;S9H?-qU zq;h^!5vG4^XBXqsg$q@%(!77bO`5 zJXKAM1Kx`53&9PgSa@34LsnmP`3967uDtYxKFAnnsphonB43ZTl19DR8d3Dnur!Z> z`OO7XHF2Z)XhA<^TFElIceoYifcTg4W!|pfWa=Nj_n(abcN(XR5jWzMVl zH8rC}Q%v6o6dhc;bCEcKc4wnBo~`W_fE0asMbqlsg>U(yOo?5E(?hI);#7xt>> zQ~?hIuSja%Z#284bQ^DeWXMltww#!a2^H8rda*tMphA_Jca&`^2D>9V44_Nd1R^c&^Pl7C}cay-mBt!P!0I8Sp$36oy&J#smsXSm#`J={1 z@*++JAUw7`Q;zPs4*7)@4iFZ9m0La8&LBS7>^00*G0mO`irb5W)Aca;N4xH8)UPN7 zdSLo@XgTG99Ns)$Jkpn?wyo<^oG{TW$(27T%$ZX}^QM9lgtc$Kx^Ag1Ymt;P&q;8v zJFlLf21=%&4~IZ@9wT8Q8Ux*Ks`sW<_A!5D`C|)ta{DKEMM>@xHF|f?4WV{FuQt=@ zmPTn`=ScNS(Sl49`D|CpxGG&8zGhGpWk2k&gQ=h47g=0-dR}ge5hc66bwFJ}V3=>5 zBeCk+p<`>8aReA1Fu5U@Ytvb=2>3aBe0Y{4h9`NMM994&$>Dz1*D6ASD{g6d^=$;D z?W!oDro8Zhki1W2(dLMr&&JFZdX?+fOWh9qG{yuE=($MdBnMdVqqNQ6b;fHG#1wrN ztvUC#F}RZZ<)WNUTu`IcRO;7a>a~)&`8n`A3!i33M@MMr_FfADMG_Vkp6egekUf}J zQ6oh2=)}Utr>o=$%A(^*^Ni1g0el>7+BC;yNLf^=Hne%|*^aCHr)NnnuRRA|E_gz} z6|BdXVHs#FfpEHI^QV}eURD+f^jf#4F#@l1qp_O<0dBt{z~F%+68%|=1p!9MjQTWi zl7Ogd*yT^}f}4FJn3SjC<(a;3`9$RC1I{OU37M3!IXWgw0Nc{sY%LPAuIHxuz>=1e z9x=a6yPb{XLvRMRo8VCd*6LdT7L5CJKf+~3oI~KMncEI@-gvC6Se*{;UYr#Y&lJ#Y z35gnKjD*k+HTUdBlKdV=bA=%X<%3M_Pjji2?Ra0x_D>xjo0upNiV(V1*?YdCkBQ7P z%jhxKY!y+>x6-Zh@0k=Ro&Y595>1rHv{^wtojD71Ayb_5%$Hk8o-OU|F%OI&l=anWLt}(u6+U}Xy`CCo~$$Hn|Wb%WvVT?UFfV_E+cMvJ;X?gMvlCd2O-jZhJhHZMX+5#^L znNvaX!gTrnznn`=wNW>k&73(cF%6O_j#+aUKD?!Q>1gYwaBG3Y&rij+@Ab_BehN~K zFD9QBp}GIt9BY0P*zg@-$yz)r$6xsthLH2G8TGdOY8T3{?;2KpQ5>RPtccJ=LzpBU zfJ442*J0M6EC`K)^s;lBB$nz-eUPm#670%;KklN6Qj=ntF4lvH~Y$d z0I_eIaw!15O#^eSA4*Wz_6(>~_sToiOq6ip_B@YC(s6lC-ml4-9tLcl$wX9VX+ZaW z{2h0r58SN`5lMr= zjF1tRZbbe=AecI@qm&r$UAe8z;nuu`n{|`QE=1C9NZpumFEI7lp7)+r;kGTDDx`#0 z9-U_XtLyFxz#)9lO}iX2!2~33K@_dA-AgBx;;*a6398 zeSrWPS*RG@AM*>7K<~U@Z|eOu9Wib8NwW43(Q^udLagEcoe=$(I;VpIzB(HA7Dg-W zK0s~=A9d-7jPUs13u!ER_|>xY`H>)o54d3a)O1nlrZRoFGMlB~^eRM3N}o*vJ<6OuS2DVPWfkD_vS=A1sMJ%H zC8u)x5_Ryx-1{tt9)B0mIBwqMq1Mj<5a#iL(QvJ^RGxE$!&JRz)tSxl=1n5M#I?gy zPqbC?5Om!h^*T!T0ibs_@yBVU%NW(w`S(<^Y0|OE;KK_=%7hrayiJR&)GS$wb+fL8 z-r(XhrSA1h`%F0lhetTiR3$^0A+I2j7gcuZw_IU2VAIiAsZzQN-QA~jLn9nAG+_U# znnnKZw9lM51RM*#JA8lpAw>8lhpay*W~8-I}Nj5&5NvKkF7UMKP!n^Q&#>#lf%$#wd@1DojCaJn$e~ zqpz3M@?Y5>XRtwz59Ck10jTy6Jx8$JUoOrD@#Y!8A4)DM;ooKvJtNO>o;`y>MI&a= zTM(+e<4hBgrx!PK)!Tz3n+0Ukp?Dd5+j>0O-)U7%nRD?)*>Oz^yG|lx6QpWg?{t{p zh0b;z@@UR@&86D~Vqq zr&9h*4h#iz5*+S^>6C+FX|9O~S3+@A!{aXXZ#oH|hQNl`+GmP*B~ zynO}S^INGMP`R;w=s$q^#bD+YcVf2Xb*-KG$C6a!o{o~po;jNvND)6^D)S$cQ_a-4 zves_eQIN*;V9Txs0Z1Z(-^rC^|tKR z0P?G{+Q0`;Fxk4r>CP-|0sHdAsd0a=T05_ZMj2nClKp@Gw)4}A27ng}PBv08uN!Q) z2og+LAA4N0W@7ZBv>X|+u7-4BApEMrLY)JFD0S9)rcOUnsXaxW{>G|ltN9;euF%{7 zqtZ^g)z_{M498_VJn-VQtP0L-4^%gYr&}(1?zfzEm>MV@(4AzS4&H+#gP0#3yn}*p zV~y{IQ4$P~`*65v=08jV0_`2@inVd}2cZ_t+R)mdxqGxK@Sw87UZ_oJA<6!}!P@?Q=?c4A|mA=Z&i_l<|C18Hh<}jIaJR#vf;N zsOToA=t*|AsR*IOy{?=*&XsZ^M=RBWm(qRqZ5T# zlP8alO-n2Ih?viWW-L!N_NigG8nyBg2dIO-cSIQ*5C631&W9gGm8*F|=30gF(Bs3~ zJM5$iX)m4gz?{&OUwhTUaOcy!@S~x|MjF>kc4q>WU>;HeMU5~%iiVfDGxJ;%GS5Yb zl<<^O%$1r&17#R9U->gzq}Fv+0P_!}SE~EZUse8t2b3i=1c@MRMJ3ycHvRpZD2z*O-NxoMqDp`={-31usI45iR3&pZ z_*-k7xDyVUm0ggkzbmpqzKIEHLtbIqRPxA8-nxPBPcs&@7NC4cail1HhWAXbS<*aZ zq5hstd+elR|pp9$^ifet-f{lPrmzR53M zAXlxGSGv^QZDPb}9iR`)8w;n5ir@xsW?MQ*o5aCbo@}fxp9aPy*2VT#} zve|~fX|33Usy1`zT-XNbK0@unL3^5^S0Ov*TO1R^)RmgIzyTQK-BM= z`f()h(I|{&D$$m}lZ%YuBAOF(m%3og>9j%@kAc-690gqe3WsWdaeT%6>c!;k1ND*tz-_-jM=ksR=cnbDT aI9F~?5A1*6l|B6;1{mlX>6B~PMEpM__Z4CQ literal 3083 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 Z=m%6Gg=jWgMU(&l002ovPDHLkV1mzBEinK9 diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index 564f8c5c841b..3e3f4c5a8fae 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -40,6 +40,7 @@ #include "cinematics/_cinematics.dme" #include "closet_picklocking/_closet_picklocking.dme" #include "crawl_speed/_crawl_speed.dme" +#include "credits/_credits.dme" #include "cyrillic_fixes/_cyrillic_fixes.dme" #include "debug/_debug.dme" #include "detective_rework/detective_rework.dme" @@ -62,7 +63,7 @@ #include "text_to_speech/_tts.dme" #include "title_screen/_title_screen.dme" #include "whitelist/_whitelist.dme" -#include "credits/_credits.dme" +#include "outfits/_outfits.dme" // --- PRIME --- // // #define MODPACK_MAIN_ONLY diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index a3b0ef965f21..ceb6020c06b9 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -57,6 +57,7 @@ w_class = WEIGHT_CLASS_NORMAL ammo_type = /obj/item/ammo_casing/d44 max_ammo = 24 + icon = 'modular_ss220/objects/icons/ammo.dmi' icon_state = "44_box" /obj/structure/displaycase/hos diff --git a/modular_ss220/outfits/_outfits.dm b/modular_ss220/outfits/_outfits.dm new file mode 100644 index 000000000000..a761085d5890 --- /dev/null +++ b/modular_ss220/outfits/_outfits.dm @@ -0,0 +1,4 @@ +/datum/modpack/outfits + name = "Outfits" + desc = "Аутфиты для админ спавна." + author = "Grombila" diff --git a/modular_ss220/outfits/_outfits.dme b/modular_ss220/outfits/_outfits.dme new file mode 100644 index 000000000000..d10bfeea5088 --- /dev/null +++ b/modular_ss220/outfits/_outfits.dme @@ -0,0 +1,3 @@ +#include "_outfits.dm" + +#include "code/outfits.dm" diff --git a/modular_ss220/outfits/code/outfits.dm b/modular_ss220/outfits/code/outfits.dm new file mode 100644 index 000000000000..b70cf4ed4d0f --- /dev/null +++ b/modular_ss220/outfits/code/outfits.dm @@ -0,0 +1,92 @@ +/datum/outfit/admin/srt + name = "Special Response Team Member" + + uniform = /obj/item/clothing/under/solgov/srt + suit = /obj/item/clothing/suit/armor/vest/fluff/tactical + suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 + back = /obj/item/storage/backpack/satchel_blueshield + belt = /obj/item/storage/belt/military/assault/srt + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/combat/swat + head = /obj/item/clothing/head/beret/centcom/officer/navy/marine + l_ear = /obj/item/radio/headset/ert/alt + glasses = /obj/item/clothing/glasses/hud/security/sunglasses + id = /obj/item/card/id/ert/security + pda = /obj/item/pda/heads/ert/security + box = /obj/item/storage/box/responseteam + r_pocket = /obj/item/flashlight/seclite + l_pocket = /obj/item/pinpointer/advpinpointer + backpack_contents = list( + /obj/item/clothing/mask/gas/explorer/marines, + /obj/item/storage/box/handcuffs, + /obj/item/ammo_box/magazine/smgm9mm, + /obj/item/clothing/accessory/holster, + /obj/item/gun/projectile/automatic/proto + ) + implants = list( + /obj/item/implant/mindshield + ) + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/arm/baton, + /obj/item/organ/internal/cyberimp/eyes/hud/security + ) + var/id_icon = "syndie" + +/datum/outfit/admin/srt/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + + var/obj/item/card/id/I = H.wear_id + if(istype(I)) + apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), "Special Response Team Member") + I.assignment = "Emergency Response Team Officer" + H.sec_hud_set_ID() + +/datum/outfit/job/syndicateofficer + suit = /obj/item/clothing/suit/space/deathsquad/officer/syndie + +/datum/outfit/admin/soviet/marine/captain + + backpack_contents = list( + /obj/item/storage/box/soviet = 1, + /obj/item/gun/projectile/revolver/anaconda = 1, + /obj/item/ammo_box/speed_loader_d44 = 2, + /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1, + /obj/item/lighter/zippo/engraved = 1 + ) + +/datum/outfit/admin/soviet/officer + belt = /obj/item/gun/projectile/revolver/rsh12 + + backpack_contents = list( + /obj/item/storage/box/soviet = 1, + /obj/item/lighter/zippo = 1, + /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1, + /obj/item/ammo_box/speed_loader_mm127 = 2 + ) + +/datum/outfit/admin/soviet/admiral + belt = /obj/item/gun/projectile/revolver/rsh12 + + backpack_contents = list( + /obj/item/storage/box/soviet = 1, + /obj/item/ammo_box/speed_loader_mm127 = 3 + ) + + +/obj/item/clothing/under/solgov/srt + name = "marine uniform" + desc = "A comfortable and durable combat uniform" + +/obj/item/clothing/head/beret/centcom/officer/navy/marine + name = "navy blue beret" + +/obj/item/storage/belt/military/assault/srt/populate_contents() + new /obj/item/reagent_containers/spray/pepper(src) + new /obj/item/flash(src) + new /obj/item/grenade/flashbang(src) + new /obj/item/restraints/legcuffs/bola/energy(src) + new /obj/item/ammo_box/magazine/smgm9mm(src) + new /obj/item/ammo_box/magazine/smgm9mm(src) + update_icon() diff --git a/modular_ss220/vending/code/vending.dm b/modular_ss220/vending/code/vending.dm index 85e963574c19..f9512e0bcda4 100644 --- a/modular_ss220/vending/code/vending.dm +++ b/modular_ss220/vending/code/vending.dm @@ -21,8 +21,9 @@ /obj/item/ammo_box/magazine/laser = 12, /obj/item/ammo_box/magazine/wt550m9 = 8, /obj/item/storage/box/rubbershot = 4, - /obj/item/ammo_box/magazine/m556 = 12, - /obj/item/ammo_box/a40mm = 4) + /obj/item/ammo_box/magazine/m556/arg = 12, + /obj/item/ammo_box/a40mm = 4, + /obj/item/ammo_box/magazine/smgm9mm = 12) /obj/machinery/economy/vending/nta/blue name = "NT ERT Medium Gear & Ammunition" @@ -46,8 +47,8 @@ desc = "A ERT Heavy equipment vendor." ads_list = list("Круши черепа синдиката!","Не забывай, спасать - полезно!","Бжж-Бзз-з!.","Обезопасить, Удержать, Сохранить!","Стоять, снярядись на задание!") products = list( - /obj/item/gun/projectile/automatic/ar = 3, - /obj/item/ammo_box/magazine/m556 = 6, + /obj/item/gun/projectile/automatic/proto = 3, + /obj/item/ammo_box/magazine/smgm9mm/ap = 6, /obj/item/gun/energy/lasercannon = 3, /obj/item/gun/energy/immolator = 3, /obj/item/gun/energy/gun/nuclear = 3, @@ -68,8 +69,9 @@ /obj/item/restraints/handcuffs/cable/zipties = 5, /obj/item/grenade/flashbang = 3, /obj/item/flash = 2, - /obj/item/gun/energy/gun/advtaser = 4, + /obj/item/gun/energy/disabler = 4, /obj/item/gun/projectile/automatic/pistol/enforcer = 6, + /obj/item/ammo_box/magazine/enforcer = 12, /obj/item/gun/projectile/shotgun/riot = 1, /obj/item/storage/box/rubbershot = 3) @@ -86,6 +88,7 @@ /obj/item/gun/energy/xray = 8, /obj/item/gun/energy/pulse/destroyer/annihilator = 8, /obj/item/gun/energy/immolator/multi = 8, + /obj/item/gun/energy/bsg/prebuilt/admin = 4, /obj/item/grenade/clusterbuster/inferno = 3, /obj/item/grenade/clusterbuster/emp = 3)