From 47a9c6885990e5716e7d682189bd67fb7ec6d285 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Sat, 14 Sep 2024 03:22:27 -0400 Subject: [PATCH] name and ammo box - UPP Combat Synth name fixed - Soro fixed - KS-29 is pump desc - NP92 ammo box --- code/game/objects/items/storage/belt.dm | 2 +- code/modules/gear_presets/upp.dm | 62 ++++++++++++++---- .../projectiles/ammo_boxes/magazine_boxes.dm | 39 +++++------ code/modules/projectiles/guns/shotguns.dm | 6 +- .../guns/ammo_boxes/boxes_and_lids.dmi | Bin 15868 -> 7144 bytes .../items/weapons/guns/ammo_boxes/text.dmi | Bin 6902 -> 3158 bytes .../Sorokyne_Strata/Sorokyne_Strata.dmm | 6 -- 7 files changed, 68 insertions(+), 47 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index f2b3ce2c7f..d5e0e662b3 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -527,10 +527,10 @@ new /obj/item/weapon/gun/energy/taser(src) new /obj/item/weapon/baton(src) new /obj/item/restraint/handcuffs(src) + new /obj/item/restraint/handcuffs(src) new /obj/item/reagent_container/spray/pepper(src) new /obj/item/ammo_magazine/pistol/np92(src) new /obj/item/ammo_magazine/pistol/np92(src) - new /obj/item/weapon/gun/pistol/np92(src) /obj/item/storage/belt/security/MP/CMB name = "\improper CMB duty belt" diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index fd37d58926..aa2b28b554 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -487,9 +487,7 @@ /datum/equipment_preset/upp/synth name = "UPP Combat Synthetic" flags = EQUIPMENT_PRESET_EXTRA - languages = ALL_SYNTH_LANGUAGES_UPP - skills = /datum/skills/synthetic assignment = JOB_UPP_COMBAT_SYNTH rank = JOB_UPP_COMBAT_SYNTH @@ -497,17 +495,53 @@ idtype = /obj/item/card/id/dogtag /datum/equipment_preset/upp/synth/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(50;MALE,50;FEMALE) - -/* var/datum/preferences/A = new() + new_human.gender = pick(60;MALE,40;FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) -var/random_name - if(prob(10)) - random_name = "[capitalize(randomly_generate_chinese_word(2))]" - else if(new_human.gender == MALE) - random_name = "[pick(first_names_male_upp)]" + var/random_name + var/first_name + var/last_name + //gender checks + if(new_human.gender == MALE) + if(prob(40)) + first_name = "[capitalize(randomly_generate_chinese_word(1))]" + else + first_name = "[pick(GLOB.first_names_male_upp)]" + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + else + if(prob(40)) + first_name = "[capitalize(randomly_generate_chinese_word(1))]" + else + first_name = "[pick(GLOB.first_names_female_upp)]" + //surname + if(prob(35)) + last_name = "[capitalize(randomly_generate_chinese_word(pick(20;1, 80;2)))]" + else + last_name = "[pick(GLOB.last_names_upp)]" + //put them together + random_name = "[first_name] [last_name]" + + new_human.change_real_name(new_human, random_name) + new_human.age = rand(17,35) + var/static/list/colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "BROWN" = list(48, 38, 18),"BLUE" = list(29, 51, 65), "GREEN" = list(40, 61, 39), "STEEL" = list(46, 59, 54)) + var/static/list/hair_colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "AUBURN" = list(77, 48, 36), "BLONDE" = list(95, 76, 44)) + var/hair_color = pick(hair_colors) + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] + var/eye_color = pick(colors) + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] + if(new_human.gender == MALE) + new_human.h_style = pick("Undercut", "Partly Shaved", "Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "Medium Fade", "High Fade") + new_human.f_style = pick("Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) else - random_name = "[pick(first_names_female_upp)]" */ + new_human.h_style = pick("Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top","Pixie Cut Left", "Pixie Cut Right", "Bun") + /datum/equipment_preset/upp/synth/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_GEN_THREE) @@ -883,5 +917,7 @@ var/random_name //limbs new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) //pockets - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/np92, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE) + diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index b61716f892..bb21ff2a94 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -415,28 +415,6 @@ /obj/item/ammo_box/magazine/type71/heap/empty empty = TRUE -//-----------------------UPP Pistol Mag Box----------------------- - -/obj/item/ammo_box/magazine/np92 - name = "\improper magazine box (NP92 x 16)" - icon_state = "base_upppistol" - flags_equip_slot = SLOT_BACK - overlay_ammo_type = "_type71_reg" - overlay_gun_type = "_np92" - overlay_content = "_type71_reg" - num_of_magazines = 16 - magazine_type = /obj/item/ammo_magazine/pistol/np92 - -/obj/item/ammo_box/magazine/t73 - name = "\improper magazine box (Type 73 x 16)" - icon_state = "base_upppistol" - flags_equip_slot = SLOT_BACK - overlay_ammo_type = "_type71_reg" - overlay_gun_type = "_t73" - overlay_content = "_type71_reg" - num_of_magazines = 16 - magazine_type = /obj/item/ammo_magazine/pistol/t73 - //-----------------------Nailgun Mag Box----------------------- /obj/item/ammo_box/magazine/nailgun @@ -579,7 +557,7 @@ /obj/item/ammo_box/magazine/mk1 name = "magazine box (M41A MK1 x 10)" overlay_ammo_type = "_reg_mk1" - overlay_gun_type = "_mk1" + overlay_gun_type = "_m41" overlay_content = "_reg" magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1 allowed_magazines = list(/obj/item/ammo_magazine/rifle/m41aMK1/recon) @@ -703,6 +681,21 @@ /obj/item/ammo_box/magazine/type73/impact/empty empty = TRUE +//-----------------------NP92 Mag Box----------------------- + +/obj/item/ammo_box/magazine/np92 + name = "\improper magazine box (NP92 x 16)" + icon_state = "base_type73" + flags_equip_slot = SLOT_BACK + overlay_ammo_type = "_type71_reg" + overlay_gun_type = "_np92" + overlay_content = "_type71_reg" + num_of_magazines = 16 + magazine_type = /obj/item/ammo_magazine/pistol/np92 + +/obj/item/ammo_box/magazine/np92/empty + + empty = TRUE //-----------------------AR10 Rifle Mag Box----------------------- diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 3000606d42..335ce49232 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -402,15 +402,13 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/pump/type23 name = "\improper KS-29 riot shotgun" - desc = "A contemporary semi-automatic design based off of the KS-23, a Soviet-era riot shotgun chambered in 6 gauge shells. Like its Naval Infantry sibling, it is downgraded to 8 gauge chambering in order to make it more controllable without much loss to overall firepower and allow for easier storage of large quantities of shells on the individual user. Its internal tube magazine can store 4 shells." + desc = "A contemporary pump-action design based off of the KS-23, a Soviet-era riot shotgun chambered in 6 gauge shells. Like its Naval Infantry sibling, it is downgraded to 8 gauge chambering in order to make it more controllable without much loss to overall firepower and allow for easier storage of large quantities of shells on the individual user. Its internal tube magazine can store 4 shells." icon = 'icons/obj/items/weapons/guns/guns_by_faction/upp.dmi' icon_state = "type23_wood" item_state = "type23_wood" fire_sound = 'sound/weapons/gun_type23.ogg' current_mag = /obj/item/ammo_magazine/internal/shotgun/type23 - attachable_allowed = list( - /obj/item/attachable/stock/type23/wood, - ) + attachable_allowed = list(/obj/item/attachable/stock/type23/wood) flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG flags_equip_slot = SLOT_BACK gauge = "8g" diff --git a/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi b/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi index 358034af1ad257481dff574c94b287efa095cd1f..8620fa886391bb189db5af9683dac94f12eb1a03 100644 GIT binary patch literal 7144 zcmY+J2UJsA)38HG00~t}kQR#4oAeq2(xpo8K|txfN)0if(nO_67o;c%(glSOF9J#x z5Tq9cq(kTg_@npU_rKp-Gqd;E?VNRH&You{4~-4AsVP}00RRBCu8zhn0DuJXTPaA1 zEhmQNSpWd=ma)E>CKiiDk&{QTaj>#7T)V~|mzLw=p{#2lm==7~!^6Ye+#DU~BPbyi z^X!GB%oQ_h2@^G8IXO9DK0Xl<9(Hyn8AbTDYaEv^)3_MRs;Q~T%1Y}ZR1M9n?l~hI z931rY^gJDG{Nhq?=owkxcDFH8(l9Yk(9pOU<`QK0{;i9W`JD_=K~{b-3FK`Jdm$kK zISDnfd(JW(;_@aE5}ayEf}*kt9#T?L=33S_a>F$Q6g6+()D)Lgf@^At2PrG7dsw9! zim01}o7|E^>WgzQGlwJL4*H6rE++L=x%?vHr5RCdHzJ>>p&KgmU@+dCSVuA;Q!OQN zYg@RMg99ro=VVKiudnapRF{wl3nO_bpSU;zp(x18C?v?IB`0#-G)4M4twq2mdV2aW z8x0HZ25)p<*E@PeZEYhxhN5&%AK#!C#T8H)M;aO$GBPqXgfdb`wkA<+s^N}^5S5kX zt)}~qp2ngnX)pNr_}=OYUl(B2H?+{w(z5pqy2C>Yg+h6FcmxFnHRJ^lQrzZNE;cqc zJXiU6_(V8aXoPtf`8gRR1UTc(;+chx1?xvyQnex3CSR6~^LAa)IHNl}E3j+!VpH#ZNzh=e3-va9MFv~{kZ zmZpxVhZ7ub=iy*_RY5_4o0F}&{CQ``JJ?lDPM)h*xjEr*xQ?#0jD$$mlXy{SetrpQ zX>oo>q#j(IH$K@SI8tY>0$^-t*p9g(EG%rGt{}xmK@2DV$Hhg&AR`I7WoQaOEREkG zh8q7pGpisC*Ffh0cfTNaUmpMs$X{DhT{wNt$(#%7_$Zh{5j%Tc> zL1mnIjkd~L?8n&M3>ACzG`!L;uU|Xs$dLTdc_FJeFj=FHRsTg;PmrrAxhndoD|zco zu&!+`$NfhHI6Zu*HRp|`%Fa)hg$QeR#WpIUm(4UcPhf>#yq;OZFC2W)r)B2bo^=z^ zmoo zRm$y@KproEe%*p;Q;GwnN(XdQ-sL7&;kf>L?k z!*&2hRD#l(ufMYs02)>K%))Xv z@)DiRM)SIE40!W&f1=8C0$kcrvkjI|jx*8-*N>%30)3Y$?9g0qu?c-Utv5{3Y#^P} zCnV%iK_WQF`gMB$?V9r_a5CgHVMF1t|LXGLX};33A%D-+?bE-q?Fa$O=QTfDkp0zvY zxCX)@y+1R?<>%9G^J{T$DBpNMp&(ziW5*vau@ z^r^*DrQoh8g(l-d+9^$r-8Y4ofqQRiJ4;n{&?-4`id)`cqAXGP zzY-l;?4oe%Qtotd%^~Xw2ZpIYdnv$Fco2USs8apNbDsRwsL9XMwq4$+fzvj)M&WXl zBW$;^^mh?Jz4v}=?M6mO_X4*X9q5mEsP~O+_3bV%JHnbNk!!QcYp0RRF|>2OHb3JE z>wS1A0z|0VXa~D4NDz1>!1LKlg9NeI59i8Aw(U1t_`Hh`qX4P$O}?6~twURqN#r(K zCe~Y`*;y3HMzv{2P7JNqZ=`=Av$}rThu1cD*R>6Vo_q9K4u>{wl?uwRG%g%h9V}LN zL?-7|cScs_Rey}k%d75+RI$!W@9LD%M;`A-wc#zD4Z-oDPut%f`8+4i(C7N`KjC^T zKDz+?B4&ioYiA7J*LHfoDA2ofi7j@do&U)yAp)S7*z0)@RcNno7Jd1+C*9&b%y;G(H1?_N z>-+~=sm+(EF|)i$r^Ja{9f!jNR9_Og+xZ;xC$v`-as%AxJ>4=o^`f=$9iIe(q!JSG z?eMr?8&wHu^8Py0E7~$S@~KsV!o{8iR4YaWw1$!qyU>UOT0usH_=~pRZ`Xv2P2+PD z0t5WDSd4i7uQa}|S}Lw-BWrBPwhij4M%6_#zBxNl(I4jwZp9~hqqdUrK}ndvnLD;Sz3VqKU!T@;E3dom|4vNSi9E_oy%`TMIJw|0Zgm*;r zO@eI4Cg;5?UbFjGeVsNAEZt@g7@a3I@=Gfdeb4flDUL@dr|NQUht5X@Pir9$uWBJf z?R$`x_Mw(WmQBgWfqAZj!rK+z^-(?%uaXejPTT{#QoO`14Y{S3<8WYJuvvdJ+23EL z+fs}l4EbEt&!Nxt3n#Fhy?K}KS9IxZ)Tuk^RDsB#^@Il{h*Q}s@Nv{o|J@j?h3{n- zo4;UB#9GdVrYEf-Q*Eb158utTmG=y(eUt9Kgqk))9ms!edkUHA0Rek}9G#<)YlkBw z>=@db@ZOG(7Nj7Qkrb)~yy-_-|GaSN(r0)G_0*T$4|}Z5?PonHdG|vkAJuP7b&mId zGeozR?G*}X0Fj(l7=#f-+MBNQx(myrd9e*ZV6Vo7Z&5A`}c1m3A9PL{y29em@(^F zS+-8Z*p?t;H+h;v1ScsT3vDQj86-HH3?`;1KL@nnITh)H8WB&FK%eaE#&ID<*b?Pw zBj;BzOa$#Ar^46MuWI-rTi%<8E1q^0sclDu#DpVSh;lgb7Is|x6_8AwRa{mXgVotd z^UO!>Xu=|ILPTG}&AF=)`LlQtN|Btc$)-$PH2d&qXTU+-{jz)^#v^?NZ@B5!LpPM_ zaZlREp@bWSeX74~G2ztNYADsSUuhr3vuPRS6S6B{zYaO0!!OfYDSY^maA_<9dnMeq zj*wcnB(eMHUV8Uentzf&vqkp7&%j}Ws|NxSLkVcX>DHY2H|1 z{}TUf8m7>9+<7>)FtyX@+FWlfY&TJg+oB>RxnVX3k&*V7Gxe%g0c{?mq4sS3a}a3yEo-< zeC!%4=WX&22G626&=lWiq2y_r=@h*ST(`Hj*p~e13ioNhtf%HK5k}=7JU&TCiQ0Ki z98c5z|5ZM@==4;PYahZv?580vJjSt|PEK=2BGgMnr-`|82ajKB__R;BGbY9Ocgp@h z)~V5SZ9lYOW>%j1=iy=AX4LdihE|T;aIUX=z3WZawL?O%@2hLtq0B+Pub8S+KN3BY z2S2E3<*8I;!QK@d2LzRDBWE*zDVKaXgD)1W;y?oc1ecDWgry|S#4A0q! z{9J;hZ8~Yu;QsUx&4k-@-V3Y+ zZ;g!g94oJ%K`pjHYi_~?wU&ep?g5Umq1K*)`Ko4xFZHsaj@{{5+&qW0cTCx)XQ7S3 z5m}JG9hHSZ-UP25)@)zSaCo%~{bXKW_46t*H!g6gA0Bq9-QV0wL{ku_kkhxci_`F| z30t*8Ik9S>HQ0m}AN%OTMyO z!xnp`YRl5|{XXrovl9=I#7UWDdC1VkfHN`zRpGm3Hmhap_AI`wy7E23+%mvk`B}$? zuda6`U+>0*O~+6)k>CmIOhntON+y9`l_!}fdoc^|{nbPsXmc-lw2W|kDVAjf=yYn! zM;CA_w-N?EoIDoJYQMeQC84Utd{MqA{gZ6e_CmdWLPdCxwGs0#H($AzSP?HzUQwmymnRz@Q`RJmGQ?%20?c%+8+DmPqq4#As@{_Po zQbp}i4Un&JNg~=$F0o^b#$$>n#3~C^5d|bEIB6pEx8c}dcXWRfU(JmQ?zZ07=_aR$ zjJleF+dIBn1Aa`IZXlo5C~Wr)j0WT_e;^wq1jjo36`=4k{`_V4<68=1h~G+`_iYPY!f#6qoSsO2$?7N$#x2&Z__WU_nFGQ+9Tg#2JZHH!& z`h@U4{j*AX|6N33#SOMhHCZ{v@tD;S!NA1L6BFc}pP$p0n5SKh=VGG`h!tuxA-Xko z@nUhh)vMw!>!=vJTmD7A+$h@!siu|94H4*|YWW8u)5(nw;FH2JL$8x)B$Z(jn50F; zi6vR=->?Y&DwYIvPx(i_bKRO`E;r_iiXL?!EsJ6NHiq^3HuXYjS*E6a_D?DC^m@}u ze>gQei$v2(iX&-MvES$^#3@jD+tz(ga=RIsx?``d*7FVf*tW8_ zl!f6czYnc4N1TX-Lk@jR<_M@A)V{Hpj3Ewn#rtF0y_*z=MuC9>nZ7l|=Em$}^zR;sguv1NmEo=n7yAM{H!!Zlk}C z6YL-y1PMfCd!rIFf2@#G5Wpnh+DvkwH4V@@1$ewG%J*1I^s9L6rTe-6NH6Axv#u-f zBYqF;fpT%e`igH8aJ~-<6P4R_pq#zIs5Uj17VxV&dCG!@!;2`W<6LWFta(;-E&g8b z+D0VF5~Nc3kUIqjoA8}JDZM@{YRm@eKIusH<2<5wN6FJ(72W2|C4Yjq$0K+KN$A6T z*1xWdkB_gc9KGBb8hX3q{}sI!eYl0)S|{LQ0MK>9LJSc45Ig6LZPO9TCCi7aq$}x1 zgmm{uEnu0$e1ZtWMyhA}&hTH8M=J`a`xO_!mCp|@$lT5q5SD!RVKE&?St5wDuP9MK zlfZ0EN56j}KAudeOLQVroFCW@%);KhxWQ5kL{}e6Z+j|I#(XS8%?_Fz*}|y_8T}zA2WULX`76#h|JVp*&G{w9&0X;38)CD0SGbvi3+C}**KSY#B8P+~`&#+F3pVw$*nJL#rAwo4MS{@fhL8h|@hg+Ss zu$M1j{wc1idYY<4W{Q6HDEcpjj57gZFaCZl3`9tevDqOBv@wZWrnW5jAzF$0k$G$j z&)l$s*xgxuC@>sq9@z`>z}(D9|J6#wA#gm}*8_w075bBgq4}2_PiIwEQlAn*DEQV| zWHKYMCFZ7Z$W_#$WdE&5nbW#iz5T(9|4Qj0l}PTTP@1+YqhB z&PjR~WRhlLn1DS;f2%%enxqg7)I41Eb~Uywc)R~l;?oeeke;~Ue^O3EOM!@(GpYn zZ-ZN<)sl(e>k#X0Qw(xCX;j_9B~u%P*l|lgHYu6^Y)(ece#ejX#+T)J>G*H3AjB#y zk-5k@2E+U5I5gs$3!P3n6T)Y-$L=J(-r&YQ2h@mNObHw z#MDgehm$a$6{^;BJ|U6rdI9^bUIWFyVoYV^Zj+p@-8(SHkL2xGoQ*%gM0laqZm1aR zj;1PNT<<4O+Inxfn!35ZJToHX5R))zlm1VDnV&rf)E-TJft44hylSp`+uh%R zai#o(e%WgOM$~T1_0nHVwBG2_gABoTrt~=>&Pe0zj)j>gyn4y<2N_heVcNoxiyVJq zXd`(Pm)br^sd}!SU0Sx_+`64a#P#Uo)AHEVN2%F}D!)Y`*ONDYsx?J$p}FD(XFg+L zyP3;O+a^2LnT|#+3szFgxnHep3){{WXcIqI@#NI5+1R&lcZPOu7RQvvDO<*-p_WiD zN$-G59?_6#*#V7MQ2bB8OUc;CTI{ga+^>JozGjHROP`s=o)YbXg0Z4tieQJYG+iTB zk)iHpN+raN*s(wr#$@ymUbm5$jD5MIy~9B9hZaQ~o4bOkgMyp_s4ENoQUgZwxPb=6 ziL5h6M{Xm)u3X^0@s(!qE0UI@q~Li5`3K{tYw>se>5BHr{TWODYdDG}D$e8459~wv zI%NjOfTI)~8d~G$Ei~(+mR3y(W}6kk^PHAHIc-8eDN&xjK`F?n&z-I*mUD%6ri;Y9 zmJK!EoG1Hly8Lhbj`+`Snk7Be5&d>YOE`>MV9g5tN`6fA&SWCAxUb{IK*898Lchmt y)SWY11r#3?Wmp2XcxXoo{`VKZzZd(Azi6);?1qEMt%-lG0CY7CHQuNr`M*+ literal 15868 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 Z*|+?-zYQrv0bg~4R20<}s^rZ={|7^L>9qg= diff --git a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi index 2183aaec3ef97d86cdab8dc26f4588a68bdaeab3..211b29d27e12c824a57de0854537d38b3dbdfdd8 100644 GIT binary patch literal 3158 zcmZuzcTm&W8vW6WAWe}4At<V5Esi6_FxhKnP7C zbONlP^cEr=ks?8Yl+c9a;l8&s`^P&o_kMHld~@fVd+&Vbi@9!XBFHbv4*-CmnW>>I z0I)%S4PK7Joyz7Ln8UDm-O|p8OeTj(Nw;V4%@hG1r-kw0<1e+OZ<+(GRoOF?*5qh^ zV+|#!srvp0REUcqIn|jIzR%0eBrB4v1fG*oy$ z0!4;7pI1CnUa6Y!M9Tvz3*?eCbCKvUBB7G8@X)`UY@y;j=dY zuot53oKS{dfpDbXJ(OR-T>uEldg)}9ICklnPFvaI`>V%y*^%EOj{8Qt6b{q#H0Fd2 zUj1dA!dX|}-1MklUe><*UK?y-bTxDe-u;eI8RAw-+`X--(^+Ybyc1s40M7q10}-WE zIM?*v6YlZ^QF~s!HM-E#K_GotB@w>Jns;_8t$cwx@}B|c*ke-6X?qQ~6{{YUY25l9 zwWmL;W*6GZl@zM_64nn_W=o>niq9Tu!+Bx)Z9YIX7$&C_)QuDe*>yD}oNC#)yLEWt zeIu*9*2`eey`Z7G*vr?Fa^3BK&a0sXHE~%)2mKPt_eIkD9tHjUz~yO=c&vGLG0*** zcn#!K3KDWT*gpK!IC^d%#@lm1;Fzt&2~qooBY34+alSwECXVekWhEQPTb#D#3+Fx; zrN=YU(qo(<;3BH^wUoF2aXsv*8b`_?EFy*ii-@4Wl0qpDEB>U!30f9kGE%{q=<Ay4jyn!{p?M9pn~FD&0Ct>pBABFt+{9mYQ9WQ(>);+oy9JB`{XG zL3tSSvRvIaHb^A5G=%?A2|ccX?^~jr@Dkz=Xsn*3j;raVwcz=D8>6L%T58upQ8IdB zstY6BXNa~!Mq?3zZ<>edPfH|_-?x%SBUba?Kgziq9f*C6dekl;+v}FYo26}Gcd9zR zOZ^KdZ3y3!I?S%;g|A4@J==%8N*NlSTqIi9obY0Mt7d+Eh3ncDGhBy1hZ$oQW!;uM%QI*6Gf~0*bl@RArhl-SDs$lbIO5A>bDy{ ze%**P16#hpPUj33xjcRmR{hL`R1=hnCN0xxCsXRq`z2eTa8;!NYy0ILhf2SuBq_72 zxBG>`zegqvXmJ7Lv{@^h@>ILzS1D!q{@Iqp95@IOk4q3KKTI@cy;t5NBn;@^iC-{< zzu%S|&%gyY7p`0kbNjuD6lW^hs7v~Wu%K+21)-^qQuG(eZmS+Il$vFd3iBV{_(?!4 z$)^8)JFHYbA6AZad{LKTmKI%HzixyH1nIEh#{)VzJR6=QgefiWPG?p&lKgg0Kmz&_ z7~963&Ot)`9NAvG4Bl`%1WoY*Cf}yp^?-DI2}B(aezzAnU0RXGZ7>4(CIu z4+BHCr=}X~IT5eYed-sPssb4|jNk3vF8SoiiHINCYX8h5l^^uWTK)@vACIl=s=bJl zCw&yaUmdnyTFqA9sYwdu-Po?379h4t#Jl+y%rot9?Iou`_Y%z?wim&R&SfL}7R0TtDE}1?dF&Efb4XsATwJ{{}?j3HFn(7m7{&6q!YB9!4aw9o&gsp7PD3vz@$CrUqJ2@9GgdC}6 z-jV$KO8z%pO0Qypj}tCFs78u2A%CPJ_F8?;`%H3VH~kpxbl%1hz*1F6ae@7i8ufho~3%jm0Kl z?8SPjYF5y&TRS&IYf2bg|3F}E@bnWqOC<$t_aJxRY%^B8=9y^{BO42YBy4L$<# zxadizxQ0#MrB2Gt&j2e21Ojm|uwa8gsGIwB6Y?JiOtQ`Vl=cEXFE9K=26tsd1xEygW3XmfVA5z zMT4x%z2NTd;ppGnAbG}#)#KQlDG}Nx+gyuZrx!UUM$RS@^a?vdm-D?i<0zFp%nyzh z5>bxVY4;*mh%w6;!67t!*=pmQM7ev869Ym}Y>HDFwB%F(z;t0N! zOAin{I1gzn_!Jst=jwa!gh-JPzU`Ax6B{KzWOg&j%Enya&d$_Vy9g$8X=pXM&)+^5r2meq&u1@JTIu9zgg#Wb8|6Ke{&JbEYc5fEYVzDA4D#}M1E{Kf4lzG z{99=KVVy{w^$&h=jjW-Be7dpF^~X{2G#)$Ko`!ikhB~a6f7{zpv=YB=mJ6IT zcl?J*e+j33v5;TMrIx#M4~=e(kwkDBW}@O<=TraDO=6_FNE%wHEKlbISx;J3i! zNIS^~rpCGq-!p!GP{ewlF^58u4Ci>~(AgYbEdi}X4A+O07I%Js4*3_|tb&!@tgy;% z#AXG|W6_UaEXO`B*^C%=&Bz5GDmj@Pq4ugAEK%kwS!R2C_JDeuu*j2}psdd3y-it|9Q%~Ic0(Uu`kBQ`FIe3}KP2r18=d7%J4&bekM%r87 zdgdNeuD-7=kqsEtm22d-@^*;&wOsmECt`o1&3Rc&-&`~yv^CU!tJKY1T-Z~z@Mupu zhr$L&#=ec0Xy57=e7=6_h|j>>OWc!|7M+%~?Y*sr4VSp~ibDrDQtbdhnB5#{Xd5+6 znned3Bo_2-kQ489%1ZNcU)A*UU|Dig9s?*p^~;j{PSe9@8%-a)`_D zee(7U|0QR$>8x-WAyyW4S!@5Ni0NL#S7ijFq(@mc=Y$4cs7*ibY7R^ne&LIXRT-hX zwXaOMO*rS}`cV34vL$5IMU?)?;BY*}En?hXXG9Q4h)J7d2lz93rZvXq+)xp%OD`6a zXZaF<2=P=*wo{uQPA5DO1jW|O_alc z_#pHrnUMsdYT6PX88Ap;vD_VgB^gwgwI6nN27zc^eMWAc-Uo-9%jyU^Def>#kjrD{ zD`fN=w~k$@tWevc3)8PRM9V7+9@=)Pb}pUcsyLFN=PC9CFM~h~#nHdU?x-C{sO;SZ zvoPIq=hunW`e3&f#i;E-qj-0NUcp<@x7**J7X%0^iLx@Mg!P+%opSkUa>Y3CT{4TH z4+wRimu(#s4#S($g?Ec$Yd^nwE>O5Zrp>=eTi3?74W(1UCO2niRx?edLKz$}6NIdn zO;~)@<$7Bra{RjJ_y^Y@I zXZQ3Yr_h+CSF{oJBjF!$!wjck>YnNvwEfJm(R0;i=Za$6mtOgFP?My@u<&fv`2Cvj z%y7i0_}Go>Z_BzdD+TYeKNfyBFTyaFl`PS9bMFO0>#H%({5cJLC1?D0Naf?-w(i$J zyFPZ;;{$k;X8aDf>ZkwPXB_w`F}+*A(99WN4MfXpqu~PZ?2I}P2l_ub`4|swjO2op zK9P3Ao97Uz{KMfo-;~iUeRJ-Hoz6OEWVFS+mrLTtF18lLeAxmA`H;vU%2de8n-%(e zGnh-)rT>xxo$pfOoy9$wTRPL?B*hCj zaqI5JG-~d>Kfq4MU!)mbV4(_QGXD8dW40yxaxKe)OvT%LF3USF2N3f zi;%N!t^t??mbl$~+17oCHc_Gs;{d!nOCk0+FQFjlk9EdAyl*~>eQGy*_2l|xX2{tT~ zW>SXFd4B;kja;VO4fjUvr|B zAS{Pz3ZJuPhP~WC`m3L*+Dc0kyPkeQ$XlItn4Lxu(y=z4k?z<%lrBf7 z@wG5jriXuW4179^EmMmFQU~xa=kA@XZp=CBzLFy%;CDW9&jm3Ad{4ja=#n@`|qrE0->T?Cdl?f?rfv*9lS82~V51H_R(8gfv;e~!MdL#5PTsh*A~r*|Bxw3|^ZxT)n^=Qr~r zJ1dge{Jpv;e#-B2y#;4OP~DX}(xuRy0sG2&)XmKY%;7f(7McV7%i6V-{&vTMJ?$pe zoHJ1c{@k{G?eW;hpN13=zlMGRlgrDimcPuiz%^rP--peVAl>ck!}Vb4F&q(?+A-$c z`GV2!{XVM!8o4Zex-fs|7Ol!=%AJdGij}MhwIWJ@^h=Wm!7;306KVAirDP2+wR)*zk={0PzIkm4E6Efz7u;~3rdEvWXqVl zCwnW!p|}YN{RS;W<9A$F$s;2uH5qW-ozKS6?OyuDD7Nn7EPi$JwB^X#NXP66MmzQW zjb4{r7MKB?C!Aw%ol>@1iPiDh5^en1Dv(qH#gR7Z;bTd=bz1VId+QHLwK+*EgSU;V>3|C<4>gwKo`0(&;U7fFVmYL930#-5Y z1>SW&S*V>y*Up-oFmQ}3X^n^vtkVaB`~%2Fk&N}@^_zEH?p1@C7Bi&&7o_@8$sO1E zLTF0Hxm|&d5dL-q!ev&Me?ZV6ac5FJ9&Q1OwyvnRUb)J z@`B{{F<`>VOCZW3x*O{ep_jxOVtP}Y#(Gxh-zD37&%8hZT3h?=BqXV z07M|p70df{GK(0*t!U)NS4U-+XJ-MJd_``sEJ5Wokg_khi{-yDk-y_{SulAk^366W zunr;_6rax(f!UICj7QM5*qycUPc}Y22pAh1Gx>HUj>yFLkiUaZMLmkzRi>8>A^O~C4QZRk%4}xknhF5;BAT=dX`=ToB=lUzIa~OzEPfvSZyJiMmPCtyk zhn2oA1x8}~F~eurD?D6q6X%w_h2Z9zYv}Gzw)RU0*#O)35J{LDc`VdnGjYfZnpz9} z(~rq4LAeW_74_Dd3wjJ}tOmryPsP{+&18mYa4vJ9*%cKk%=EzbCOfmet-78z#ZsDG z9ImfDza_5&!BAa7+k1=q(fPh~O%g~TU7T`oi5~tYdkx$EBcJffK>0`lOR@L`L*QR( z^lvO>%G19!{I|1)^5Vaz!FId9XRrhdpR3;K+JUqQmXAXToP2|}f!dGEs@~fM!W6qB zH@}aag*nVHnXoE>l;6!=oV4B#lxz>0fD-5$PV>=kKho1S$+?pS^gKSo;%?FB3Lt4b^4(Zy(yQqnnFH^jq@I{sJkj%JRbm7YWdZwOn z(1s*=c%9&{lIqU}+_c{YQ`%SjkXlCg}L!?&S|_9)4i=G_%UlpJ9$iuR%XIjUb6 zN{=b~%B272q6U>dW_bTpdVit90I22p-;cKXerROp03_lf{-1;s5yNIeJ6&|IflPx0 zq|xDUiA2U=kMM1}-6ilp4|_RqOyN1M%Elt}jin65 z5uX!j+~42cZ2UZ4mSvB8j)^dO`%<9rN70Y4hu zEWVUjREZ{?(kPS9-|L3)XfjZ`;9jokOw{S)#kX&RW02%6RlMZR9^J#~qRCJd`mBV9BVLk)(+ zE2IL)ajS38$8HmG;Lq%HQN6ff=r`!Jn41w@1RFmVRnx4b=6nQ#K$r(=Fd?lRbVVyl zCA#i@(?ZKPa=9_(9xB7IK^GtOY)yTQWa_o@FDWPZSl@i4_Eb)2EMsIG$2|4T1Fpbhu?}ot zoI&BwA@-jXmsn@!muT1Ts5jpWTU1w&$oh85&0koY(i?gAceLu%Y+)>8#&jbGnj*0& zDV_@44Uljuwj$28A+X@jxXj34`sMcR{tO#_fLrDInptOX<9NXG!a+8urn|}5cK2!i z;h_Jr9seIX|E|>dJ62i$CD8sSEGImKHA0~IdIbYnY3iwoP)F|-eSBcoS3HIqrt&K( z-=fAPn@*-qpzE8)*(Zq2C|f#F)OeEaLR&Xq!A_5(YpZ!~@Yd3uLE&ymV+?6zd-K(f zVf#koH&r}^y+QXAFfP}UVg~tuPi0xT>yZEEhcmISI;G?q)`W>b)GAih`o9{pcSl8>3IEX&z8|)&$TL3 zQ>vUcS}!*(L<>5pYh5~d+(9R}>kFl`A*PCwO(rswlXa6nW-bp3d(Y@wZ|hGi5}sW| z;~9NMJLg06lLR_MRTxXuuu+ID8=Oh{;$5d5KuDHYT0d|LXg#~9I{&I(+X2K-qGe=+ z^S#cVSv>h1z5l9%2N#FSSg-S9GyaHa}QOF-tXSvGt5P zDYQ0sbD(vQPl?BRMz)PKc+aD(PpU@_qFvb4A9xWa4?o$#|kWkiI z@&6|NN7Zqgx_^j`pJ&q`aiOsV$(Oj8t31o-joA2&I=-T}2m~{_+`f0~3@7wrN0-Tz z9Rk@DeMsDAQd@m8vIgtqk$9viP~d0xhcKbspq5oeq3q?)b^C2>pwAY)jdxYcR}ili zDto=Q3*bWurlu8M5QGF3rzIuIhm#(l;~dXIP3t5{vDI#=5Qbi9``T=i5TzogjFljf0IL5SQ~a6Fn%U+G>Tt2Sc%`>ab@3j71y zHZu&n)h3J3Xuv=(jTpnZU#GgZt~>wwq0x(&8Iv=Iz`<7E#npy;-H-W#(@(u*VB-%O zm*FH2mSb}&&5a|0Ea7h_WW)cs?2NKbn5f{yDz?B#F*mpSLhPp0P%5q|iI7uU6Yb=4pr=I|A7)mivyj3)#1O zB@F(I_XJG`6L$*n#?6mutwvEryPiz{k#>(;dJjnL@ySCnlun~eUe3%z+VC%nsUSg2 zxb@J9F5jZHvtpP@efnKNWfoIR!r9u%<^|isGl$Y?XfTrO_1OqQc+^+vu$%j)@#sF) z>swd{nJ|5A*QnE0Rm>7^{tGc-hA-eXi4%H=ZnAE7O2@s@IqDa3#Gc}mS1^%rBYOQu zBBgVH?`s>_Ft_`pt$+rT?*=eeqKzSeEB~`#Gk4nLNAC1q%eNxW#{n1C>Ur8grzc-p zkkI=V@`wX{NMTC94zIYy0NyJlEdIW1V~`g~uK#fgG5Skwa){?llculWj@)yQ!MJQJ z46v-8h&4gBQbpB+TgCY^`#_a?(rma#cK$=bQ8ZfLRK@D{`!$u*J_KzI`5zAF5uw&d zj)GufJ^1BlQ9C%6TW@<^3C32FVu?!gahHhLZC5P>btspE*9I!RThKBXTzFjbYqh@B z2EXj7@Q8^mqtAO}KIwSoLoj7RY5za6RbDst2uDKdW6PsV4=9WH%iRBm%n#=Xqi)4;GW&(Gl~#Zt5eK&YGFsy8O)PLAWrE<^gjC0X}#Tb1bT$EydjmRu?EgB zaaO1FkBl=;JfSU8j=JyAN#7kQG|1!$!F>Y)PEh;WPU!DzpbqCG`Y%0rGnuhN-#%=D z{2k}s4EEw?G-ieG5gCnb_Z*#=MkD38Kgazap`_8F;24Ix&JLP5t=({jG1I2ce`YQT z235m`Be_p&niLWigqDw`gi&Faac<2}&A{`IoJG;)=L)pKhe#_|RL;1yQAGu-8fYTYzgm?08A#0mT1N_ zQ`kEu*B4bzOM5zT@_7GWLdhfYVH`%i;Wg3;w{m{lcIdD@wkM=yxd;LMpICQp1cd24 WIC(W$u(k()UgjnjkQgJ^+y4h{VerTR diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 2e0b8f0ad0..c280c69ab3 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -9866,9 +9866,6 @@ /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot, /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot/upp, -/obj/item/weapon/gun/shotgun/type23/riot, -/obj/item/weapon/gun/shotgun/type23/riot, -/obj/item/weapon/gun/shotgun/type23/riot, /turf/open/floor/strata/red1, /area/strata/ag/interior/landingzone_checkpoint) "bUJ" = ( @@ -11788,7 +11785,6 @@ /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot, /obj/item/ammo_magazine/handful/shotgun/heavy/slug, /obj/item/ammo_magazine/handful/shotgun/heavy/slug, -/obj/item/weapon/gun/shotgun/type23/riot, /turf/open/floor/strata/red1, /area/strata/ag/interior/research_decks/security) "ddP" = ( @@ -20891,7 +20887,6 @@ /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot, /obj/item/ammo_magazine/handful/shotgun/heavy/slug, /obj/item/ammo_magazine/handful/shotgun/heavy/slug, -/obj/item/weapon/gun/shotgun/type23/riot, /turf/open/floor/strata/red1, /area/strata/ag/interior/research_decks/security) "lKv" = ( @@ -30422,7 +30417,6 @@ /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/obj/item/weapon/gun/shotgun/type23/riot, /turf/open/floor/strata/white_cyan1, /area/strata/ag/interior/dorms) "uBs" = (