From a215ed86aa0a160bfff0370527887e10a8163528 Mon Sep 17 00:00:00 2001 From: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Date: Fri, 9 Feb 2024 19:06:47 -0500 Subject: [PATCH 1/2] And look, the red just washes right out! | Changes a lot of blueshield equipment stuff and resprites their crew monitor (#372) * no stains or your money back * like they werent ever there at all! * actually puts their crew monitor in their equipment * byeah * makes the blueshield mod not worse than a sec mod * Update modular_nova/modules/blueshield/code/modsuit/mod_theme.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- _maps/map_files/NSVBlueshift/Blueshift.dmm | 2 - _maps/map_files/VoidRaptor/VoidRaptor.dmm | 1 - .../modules/blueshield/code/blueshield.dm | 3 +- .../modules/blueshield/code/closet.dm | 6 +++ .../modules/blueshield/code/clothing.dm | 36 +----------------- .../modules/blueshield/code/medkit.dm | 13 ------- .../blueshield/code/modsuit/mod_theme.dm | 24 ++---------- .../blueshield/code/modsuit/mod_type.dm | 9 ++--- .../modules/blueshield/icons/M45A5.dmi | Bin 825 -> 0 bytes .../modules/blueshield/icons/device.dmi | Bin 499 -> 884 bytes .../modules/blueshield/icons/energy.dmi | Bin 966 -> 0 bytes .../blueshield/icons/guns_lefthand.dmi | Bin 1253 -> 0 bytes .../blueshield/icons/guns_righthand.dmi | Bin 1225 -> 0 bytes .../blueshield/icons/melee_lefthand.dmi | Bin 395 -> 0 bytes .../blueshield/icons/melee_righthand.dmi | Bin 368 -> 0 bytes tgstation.dme | 1 - 16 files changed, 17 insertions(+), 78 deletions(-) delete mode 100644 modular_nova/modules/blueshield/code/medkit.dm delete mode 100644 modular_nova/modules/blueshield/icons/M45A5.dmi delete mode 100644 modular_nova/modules/blueshield/icons/energy.dmi delete mode 100644 modular_nova/modules/blueshield/icons/guns_lefthand.dmi delete mode 100644 modular_nova/modules/blueshield/icons/guns_righthand.dmi delete mode 100644 modular_nova/modules/blueshield/icons/melee_lefthand.dmi delete mode 100644 modular_nova/modules/blueshield/icons/melee_righthand.dmi diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index 17e03bf088f..51457f5c2a0 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -50272,7 +50272,6 @@ pixel_x = -4; pixel_y = 10 }, -/obj/item/storage/medkit/tactical/blueshield, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/blueshield) "jGa" = ( @@ -126743,7 +126742,6 @@ /obj/item/storage/backpack/blueshield, /obj/item/storage/backpack/duffelbag/blueshield, /obj/item/storage/backpack/satchel/blueshield, -/obj/item/clothing/gloves/tackler/combat/insulated/blueshield, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 7c2571b24f6..4df7be29bc7 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -31453,7 +31453,6 @@ pixel_x = -4; pixel_y = 10 }, -/obj/item/storage/medkit/tactical/blueshield, /obj/effect/turf_decal/stripes/line{ dir = 10 }, diff --git a/modular_nova/modules/blueshield/code/blueshield.dm b/modular_nova/modules/blueshield/code/blueshield.dm index 5bc360f18be..152194778b9 100644 --- a/modular_nova/modules/blueshield/code/blueshield.dm +++ b/modular_nova/modules/blueshield/code/blueshield.dm @@ -48,7 +48,7 @@ jobtype = /datum/job/blueshield uniform = /obj/item/clothing/under/rank/blueshield suit = /obj/item/clothing/suit/armor/vest/blueshield/jacket - gloves = /obj/item/clothing/gloves/tackler/combat/insulated + gloves = /obj/item/clothing/gloves/tackler/security id = /obj/item/card/id/advanced/centcom shoes = /obj/item/clothing/shoes/jackboots ears = /obj/item/radio/headset/headset_bs/alt @@ -61,6 +61,7 @@ head = /obj/item/clothing/head/beret/blueshield box = /obj/item/storage/box/survival/security belt = /obj/item/modular_computer/pda/security + l_pocket = /obj/item/sensor_device/blueshield id_trim = /datum/id_trim/job/blueshield diff --git a/modular_nova/modules/blueshield/code/closet.dm b/modular_nova/modules/blueshield/code/closet.dm index 773155a1e30..f7d52beacd7 100644 --- a/modular_nova/modules/blueshield/code/closet.dm +++ b/modular_nova/modules/blueshield/code/closet.dm @@ -33,7 +33,13 @@ new /obj/item/assembly/flash/handheld(src) new /obj/item/restraints/handcuffs(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) +<<<<<<< HEAD new /obj/item/storage/medkit/tactical/blueshield(src) // new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src) FF EDIT: DELETION - BLUESHIELD-REARM +======= + new /obj/item/storage/medkit/frontier/stocked(src) + new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src) +>>>>>>> b8061af7e (And look, the red just washes right out! | Changes a lot of blueshield equipment stuff and resprites their crew monitor (#372)) new /obj/item/storage/bag/garment/blueshield(src) new /obj/item/mod/control/pre_equipped/blueshield(src) + new /obj/item/sensor_device/blueshield(src) diff --git a/modular_nova/modules/blueshield/code/clothing.dm b/modular_nova/modules/blueshield/code/clothing.dm index 27c7edb7ad9..cd6fdfbc50f 100644 --- a/modular_nova/modules/blueshield/code/clothing.dm +++ b/modular_nova/modules/blueshield/code/clothing.dm @@ -2,19 +2,6 @@ //Uniform items are in command.dm -/obj/item/clothing/gloves/tackler/combat/insulated/blueshield - name = "combat gloves" - desc = "These tactical gloves appear to be unique, made out of double woven durathread fibers which make it fireproof as well as acid resistant" - icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi' - icon_state = "combat" - worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi' - resistance_flags = FIRE_PROOF | ACID_PROOF - armor_type = /datum/armor/insulated_blueshield - -/datum/armor/insulated_blueshield - fire = 100 - acid = 100 - /obj/item/radio/headset/headset_bs name = "\proper the blueshield's headset" icon = 'modular_nova/modules/blueshield/icons/radio.dmi' @@ -32,17 +19,12 @@ . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) - /obj/item/clothing/head/helmet/space/plasmaman/blueshield name = "blueshield envirosuit helmet" desc = "A plasmaman containment helmet designed for certified blueshields, who's job guarding heads should not include self-combustion... most of the time." icon = 'modular_nova/master_files/icons/obj/clothing/head/plasmaman_hats.dmi' worn_icon = 'modular_nova/master_files/icons/mob/clothing/head/plasmaman_head.dmi' icon_state = "bs_envirohelm" - armor_type = /datum/armor/head_helmet/plasmaman/blueshield - -/datum/armor/head_helmet/plasmaman/blueshield - acid = 90 /obj/item/clothing/under/plasmaman/blueshield name = "blueshield envirosuit" @@ -56,8 +38,6 @@ /datum/armor/clothing_under/under_plasmaman_blueshield melee = 10 - laser = 10 - bomb = 5 bio = 100 fire = 95 acid = 95 @@ -68,15 +48,9 @@ greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#3A4E7D#DEB63D" - //alternate_worn_icon_digi = 'modular_nova/icons/mob/head_muzzled.dmi' icon_state = "beret_badge_police" - armor_type = /datum/armor/head_helmet/blueshield supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON -/datum/armor/head_helmet/blueshield - fire = 75 - acid = 75 - /obj/item/clothing/head/beret/blueshield/navy name = "navy blueshield's beret" desc = "A navy-blue beret made of durathread with a silver badge, denoting its owner as a Blueshield Lieuteneant. It seems to be padded with nano-kevlar, making it tougher than standard reinforced berets." @@ -120,7 +94,6 @@ desc = "A tight-fitting kevlar-lined vest with a blue badge on the chest of it." icon_state = "blueshieldarmor" body_parts_covered = CHEST - armor_type = /datum/armor/suit_armor/blueshield uses_advanced_reskins = TRUE unique_reskin = list( "Slim" = list( @@ -143,11 +116,6 @@ ), ) -/datum/armor/suit_armor/blueshield - bomb = 30 - fire = 75 - acid = 75 - /obj/item/clothing/suit/armor/vest/blueshield/jacket name = "blueshield's jacket" desc = "An expensive kevlar-lined jacket with a golden badge on the chest and \"NT\" emblazoned on the back. It weighs surprisingly little, despite how heavy it looks." @@ -165,7 +133,7 @@ desc = "A comfy kevlar-lined coat with blue highlights, fit to keep the blueshield armored and warm." hoodtype = /obj/item/clothing/head/hooded/winterhood/nova/blueshield allowed = list(/obj/item/melee/baton/security/loaded) - armor_type = /datum/armor/suit_armor/blueshield + armor_type = /datum/armor/suit_armor /obj/item/clothing/suit/hooded/wintercoat/nova/blueshield/Initialize(mapload) . = ..() @@ -174,4 +142,4 @@ /obj/item/clothing/head/hooded/winterhood/nova/blueshield icon_state = "hood_blueshield" desc = "A comfy kevlar-lined hood to go with the comfy kevlar-lined coat." - armor_type = /datum/armor/suit_armor/blueshield + armor_type = /datum/armor/suit_armor diff --git a/modular_nova/modules/blueshield/code/medkit.dm b/modular_nova/modules/blueshield/code/medkit.dm deleted file mode 100644 index 3939188f699..00000000000 --- a/modular_nova/modules/blueshield/code/medkit.dm +++ /dev/null @@ -1,13 +0,0 @@ -/obj/item/storage/medkit/tactical/blueshield - name = "blueshield combat medical kit" - desc = "Blue boy to the rescue!" - color = "#AAAAFF" - -/obj/item/storage/medkit/tactical/blueshield/PopulateContents() - if(empty) - return - new /obj/item/stack/medical/gauze(src) - new /obj/item/stack/medical/bruise_pack(src) - new /obj/item/stack/medical/ointment(src) - new /obj/item/healthanalyzer(src) - new /obj/item/sensor_device/blueshield(src) diff --git a/modular_nova/modules/blueshield/code/modsuit/mod_theme.dm b/modular_nova/modules/blueshield/code/modsuit/mod_theme.dm index f7155396c92..2a3ad3d195a 100644 --- a/modular_nova/modules/blueshield/code/modsuit/mod_theme.dm +++ b/modular_nova/modules/blueshield/code/modsuit/mod_theme.dm @@ -10,17 +10,12 @@ fires, electrical shocks, and contempt from the rest of the crew." default_skin = "praetorian" - armor_type = /datum/armor/mod_theme_blueshield - resistance_flags = FIRE_PROOF|ACID_PROOF + armor_type = /datum/armor/mod_theme_security atom_flags = PREVENT_CONTENTS_EXPLOSION_1 - max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - siemens_coefficient = 0 - complexity_max = DEFAULT_MAX_COMPLEXITY + 3 - slowdown_inactive = 0.75 - slowdown_active = 0.25 + slowdown_inactive = 1 + slowdown_active = 0.5 allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, + /obj/item/reagent_containers/spray/pepper, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, /obj/item/melee/baton, @@ -54,14 +49,3 @@ ), ), ) - -/datum/armor/mod_theme_blueshield - melee = 40 - bullet = 30 - laser = 30 - energy = 40 - bomb = 50 - bio = 100 - fire = 100 - acid = 100 - wound = 20 diff --git a/modular_nova/modules/blueshield/code/modsuit/mod_type.dm b/modular_nova/modules/blueshield/code/modsuit/mod_type.dm index 2620cbcea70..d62237d2f4d 100644 --- a/modular_nova/modules/blueshield/code/modsuit/mod_type.dm +++ b/modular_nova/modules/blueshield/code/modsuit/mod_type.dm @@ -3,15 +3,12 @@ icon = 'modular_nova/modules/blueshield/icons/praetorian.dmi' icon_state = "praetorian-control" theme = /datum/mod_theme/blueshield - applied_cell = /obj/item/stock_parts/cell/super + applied_cell = /obj/item/stock_parts/cell/high applied_modules = list( - /obj/item/mod/module/storage/large_capacity, + /obj/item/mod/module/storage, /obj/item/mod/module/magnetic_harness, /obj/item/mod/module/flashlight, - /obj/item/mod/module/jetpack, /obj/item/mod/module/projectile_dampener, /obj/item/mod/module/quick_carry, - ) - default_pins = list( - /obj/item/mod/module/jetpack, + /obj/item/mod/module/holster, ) diff --git a/modular_nova/modules/blueshield/icons/M45A5.dmi b/modular_nova/modules/blueshield/icons/M45A5.dmi deleted file mode 100644 index 0334a6cdc78a77e3018f3ef97d7bca532d03aab3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 825 zcmV-91IGM`P)P)t-s0000j zF+5dSW0RDd!^zD60089Y>Kz>&7#JcrHc2BPG*eY&H8x2{Nm?&2KoAfRFE1}ACnqp9 zMsP9!s$&4$pc^0~El^ctj*plE%Nq0m0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#ae(ZM)XemZ5+KLe zh^x3Hu_P79RLV6mO*B>F;!MdbDhBcmxj55`5_3}_Y*bb8xrymSs!YnyDIq~=d`^CH zc4`Vi9Yy)&If;2Gx%nxjIf+FiD%VXb&B-BEPik&KNhK~#$_lQ2F5plH0G8r!@F^jl zRsaA2?@2^KRA_hN_uyMYEhB8+)gYuNBL(5R!{5$FAEMv#~? z0)y6vgxyoS#q*BC{u(G@l*q$S4shq~?#FW8X|O1UEz#3Z-)=pU^BX5Eu0*aamY*V#VbT)Z=eKDRJjw!xwbar*=M%ZO<5Lx3CXgTPSJNB zv8`^(vNBl(WZ6r91^TO3Y^htFWiPz~AzrRCvMf&|Hh{OFd6u<_Vb@UWVe7Qp%(4d2 z8&=|_ESo}%A(wcQEynP6lP+8QXx-C`o2DCxQ-@^?j=u1St;36TaP)>pY+Zo)wxoMO zY+ayQ;tO%ux*)YCR$ZY`D6A*i|LkCKE;Baw#up=V?*`(??`O|0j{YW$b(eo@?96isX&GGYWh&pnf#j8u6{a^e6kl#GC1{j@v00000NkvXXu0mjf DmCAGj diff --git a/modular_nova/modules/blueshield/icons/device.dmi b/modular_nova/modules/blueshield/icons/device.dmi index e079de6c16092a10d4b7dae4361018e7a99b65bc..449e43052746dc23531228af5b9ed7bb7c36f99a 100644 GIT binary patch delta 731 zcmV<10wn$O1M~)v83+ad005$$euR;EkbeTLNklmKNCJl z`|)N0WCNevyTfql;$?>S51)fEa;Ss&AOMnwIhGoL9`@rcAQsN({13`Uu%uM7^$i2R zsv=JHA8+4h=1nFTv-Yfvp3@cb*mMiPaqF`hIk_V{+si)NQ^s=8| zEdVP?VV2*$_!zHxkUCIOq(%)u4}bd!7J|rC3&`?d@8c-)X%ZYLGzh?AfEobZeh@g8 z`4%p(di59zO{)C_0{|3~u)+lfkR1R5^Zbob_|#4T$o8X000T|vo5zo@R)55k<+f)b9>c-+rRI!^i~-uI?y$fkn;kFsz>%0d!JM zQvg8b*k+L-kbeNwNkluz1r;E*) zOaG;6(=l#sRX166W$h8(c5WTuI{)p^xUs!=x1lWOsQ`r+!;24WfW)&QY+?dL4nw#@ zV^$yoWS$KZRQ8z(5V^4rOqlOu#3BR07c@v%bU+uTWow?A7$eR07*qoM6N<$f=@VC0001!P)t-sz`(%& z%m89qIw~qE92giMA0JFbDra9rRZcTCGBHCyKSfVVYHCh1EE3EB0RP@w{{R3fDJdf( zBRnPmFgiA3YG)`gEeZ+>E-o%7CnpsZ6*xFJT`DPk0000NE>a&JcTP(HLW3+UEC5iT zW->7VF=9MCJX-(&CMG6SR8&PpMKLikVow1700yLk0F?{?z`($+A>~Z~0004WQchC< zK<3zH0002JdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r z;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DXBQUG*5|(GbOXA7|1u|;!G<_%uR)` zQB}nkmk_NqIU}(sJ(Ua{*_k;xMCu?xX=-jkNhNl*z<^0f%}J~Tg^P|cLSsQnxn)6S zaY;U5I}l2V^DvTnQo;#I8&O`zw1!k|#08t7fsPTEvVyCh3pfP=0BbSB>hruWH~;_w z7)eAyRCt{2+3ix|Fcb#huuYJ(E{a>bG}3|#Dofq<{_oC{52R&HqoXvl&imv?JDv{b z?FpzI7y|%+|JUf-C%<6AIZrf^2%>+|ZZ|% zGLbX^GlxTQJU(ZW5$U_@QJ}-LrzWyg+Ovd4ApV^InOu;*30wpMT=vvvsZ6fSnWT-^ z_bx=5B;AXCkkjltV>y?0^Xc}T6Ls?Rzs_s|Idtcj{&~(*##xN+CP1DST*xSQZ~A9h z!Q=Ec3fh5~{aKOaQ3t?gSrIn?oAJ2)0RRBLzModa0Q330EX$(=N)6RtwXp7Cpa3_< zTvPUF4}k#F#mDN^zOL#vvm456iYohFZn;|awmYg<{(61;%dIt`3_{TO%TlP;bI5eD zT5UAX?S$%8PrbgocWb@A)#{qrcgEqG#bU)aQ{rjxruqYUwSJhtZhuGWT5Y%6&K5AX zxgkpkht3vgOX3^x8|qj7It6GNRVqDTwKiK470_@rYh|piD$N}hgu8P=SkHAHU6~IPlRJ{H!g8n-k zEr5#HDHNcSn1_A&8z2F<-gm^ArjI000000002t o=X<+OCiHwCssjK30Kf-416$`li~TTU0ssI207*qoM6N<$g1!x+&;S4c diff --git a/modular_nova/modules/blueshield/icons/guns_lefthand.dmi b/modular_nova/modules/blueshield/icons/guns_lefthand.dmi deleted file mode 100644 index 73dc7d7dd3f60911e9202a889ccc0ca27a48daf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1253 zcmZuwdrVVT7(Yk=B?Cn=P#4x_=olIb1YfA-szasnay-Us(yD+eC>Bb6QJA&8NJ}s6z3ts)y8reiCnx9RoZt8Te!uTK zeIRL{kM|mH0Duo8E;a=Kx1Eb?sXKY&NJ_6Gw}=A?X?qAjtPc&PQmF(0d_G^LQk?)G zEG&${V6a%MV+8TVF%AIr#6xhk8jz235pE{=*R3QaDHZHAjOCLDU3pq&No*eXNb%94 zlA|0p0AJJJdpvlviE)K5mI` z%WsmkJ?Go~ZPMe9KT1yBkvO~Y-dDa2n^LF)(!KYhe|*bbQ$N!M|LX4HTVYa74*{)p zC92R&!nFz%$ul_{voNSPD>pjuVxOr%5ZB$Rs2^@BH=@Hi@byUteSS397@R$N7nRSt z#WrnQ*}OvD1%P`wBX(C>nbf2kFTS~Rg~x$rKkmyZ0zz5q{nlmPjqo3@R7_TE{*sp5 z+tBJp3InJE{STMre^w&1S1eHl4vBJ>WQA98gN zxyN}NbgR+UBB;bS2NT7+Z#@%F48qs&0DU4;_;$-OqB=JePJBoVVtjw;+if}w#gYad zsh85&Ci`MOGCDUtaVoWz7L4aHH{OoFD3R$0Zxd?VDmvIWf>ab$o9*8kl5dyYz;z4D zbofKjL9Hd63iU8E#3BLQ;lhiXG2WB^&{U6=n9#%KCCZ;So*c?RWd0a0eVSS28Is^5 zx}>K>DfAgUR|agh)ePHp3qHyttti%PS-#r-sFR7Vo_YJP+pJit{mBJzzv3cH5!=H$&b&=}7I4?2YpRe*O=r87QhMhkobd_=i)^2+7?(Gn< z9m#VDmjx0MymYT}zO>_kDYf~&rM5FlI+5f=u3ggXB|4iy|X7B?TI610AHgrNoV@dms8hXL0 zL^i~*3GH2?9)$h?j4tE zC=RAwF^pU;YSPPl8_gCq*P>2VhmXtSy>k=(UwN|G(vk4vG^djLHO%e`vZYHJ?84_t zTcFFVxhx}n6NnG_>*Z|~;urkM0V`HG!L0N9WbCZ5 zR2h}|DyD>J)JGy{yN-U4=9FNBV-rLgnn+yN&E3`ZkM2F^Iq!L%_kEt<@BDsGerQO5 zh1qs9001n=$9%&9z{m#+`_0B!T7t=LnQO*eKg_S|<@)A5RKdQkNdp=~5R_4WKj z7cEo2Hascn6`-w;AVFZwV{6(>@LI#TEK^aiOGII6z2_xxbpRy@zsz@=6vHOn3r?Rl zbo}}Z0E}bFzF$$(%TyDR@Nt5bPuS**TkZQ%PU7>S3W8)i&12MzD}CUyI%cMl-dJD4 zM8Sk~xJl$x^!uuj2`PJ;vgt7*ZE}=ka@L_b+_l6MTQ^oR+JRIw5~J6fwP{}Mk|(5$ zY1b{$3?aG=CbbanO`wGb%XQ|cW%>@(m$KAM+?iy!d4GA*95l;w zv=%oKY197d3(Bmw&;T$usr9b^yAOEmM+c0**haA#fbJ#1ze<)o*NvA(;K~m zh&jwxD4FW>gCjM15I1NURL;YxIRXQtnIQ1nhPan3D^8d3_Imfy9E7J%iiKg$NQeR( z7c_^pAZ>N$6qf5hq>0Qb`EtsR#osl?>Pbq$5%Bhe>ASg?RezQ9lp;>_A-S!Io}%~- zb3^kI>R$D(y0zhq<_*-n^zkSEVhNK2!M}*9Hz;tjHpfPEQ*R>Iwucw zmeiHR+JjCJH0A_I%f^3BE$Z< z!C>n1k*JX}HRj>D%DebQjJ5I$d|)!|iE;s>eP9Aab<%!Ks%WM4e~Ym}ln*!Z<%6YJ z?6VDvdQChRl)1o&a8zO2Hozt(>7bnF@1Khnq0U8b0HEnibFB8PZ0f@~Z!jbKh4?ld HjmiEG5b=O? diff --git a/modular_nova/modules/blueshield/icons/melee_lefthand.dmi b/modular_nova/modules/blueshield/icons/melee_lefthand.dmi deleted file mode 100644 index 8e76fa56cec3bd8d3fe137ff8d37506fa94f492e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=>VS)*8>L*xVyW{$jC4lpQ)>> zn>ll4WMrhKrlyOtb4aPl1fVj;k|4ie28U-i(tw=os*s2hm(=3qqRfJl%=|nChKf1C zVFg8{-@gPGeEj-E%Uf6L+?n&i8$t~(8b5fXbKXbuBtub8?+y#&Amhu%UJ7#_O*%3u zL?Kvn<&Fg!_O6}X#;TiFNG$2@HeRb?XfArh>`72q!PjEO+1w0K^QC4mRrOp3TD#oS z#WBRAGdV$mm6?f!RiZ`Y!wF-iRMDv)Gy{SX0)!6fu20~(a&}2h!)c+k@MMG3oSxGy z8<>D}gSVsg6_pq+3$6t`F<~1H%Qj!;d*sNh$ST?*vO!%SD9~+Au-icm1+E8rObt(& zIUeXRNi2*i6k}ZQiIJs1l<~nQMxG7gj29qOA}hzy2+=Ld8#hKC3~V@ZFpb4}nLykH h2akgpf)1$+3_pJHhflNEIvMC>22WQ%mvv4FO#o+`i~;}v diff --git a/modular_nova/modules/blueshield/icons/melee_righthand.dmi b/modular_nova/modules/blueshield/icons/melee_righthand.dmi deleted file mode 100644 index ae39c2bd251765f06db9903f12fbd34774e18bc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4*8>L*XliOkMn+0W{daM8 ze$m*q4=BZ0666=m;PC858jzD+6%tY6l3JWxlvz-cnV-kNP%$Sste~j$`?<0pgt;EOaGp6f@k8kpU-6PK-xkhVKd$4efNo^) MboFyt=akR{08dVega7~l diff --git a/tgstation.dme b/tgstation.dme index 66539905a9a..9c566af049d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6707,7 +6707,6 @@ #include "modular_nova\modules\blueshield\code\clothing.dm" #include "modular_nova\modules\blueshield\code\encryptionkey.dm" #include "modular_nova\modules\blueshield\code\landmarks.dm" -#include "modular_nova\modules\blueshield\code\medkit.dm" #include "modular_nova\modules\blueshield\code\devices\crew.dm" #include "modular_nova\modules\blueshield\code\devices\sensor_device.dm" #include "modular_nova\modules\blueshield\code\modsuit\mod_theme.dm" From d18c69f7c110ab52096797d5dc2860f8efc21ad4 Mon Sep 17 00:00:00 2001 From: Iajret Date: Wed, 21 Feb 2024 02:55:52 +0300 Subject: [PATCH 2/2] merge conflict --- modular_nova/modules/blueshield/code/closet.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modular_nova/modules/blueshield/code/closet.dm b/modular_nova/modules/blueshield/code/closet.dm index f7d52beacd7..d0afd953226 100644 --- a/modular_nova/modules/blueshield/code/closet.dm +++ b/modular_nova/modules/blueshield/code/closet.dm @@ -33,13 +33,8 @@ new /obj/item/assembly/flash/handheld(src) new /obj/item/restraints/handcuffs(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) -<<<<<<< HEAD - new /obj/item/storage/medkit/tactical/blueshield(src) - // new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src) FF EDIT: DELETION - BLUESHIELD-REARM -======= new /obj/item/storage/medkit/frontier/stocked(src) - new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src) ->>>>>>> b8061af7e (And look, the red just washes right out! | Changes a lot of blueshield equipment stuff and resprites their crew monitor (#372)) + // new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src) FF EDIT: DELETION - BLUESHIELD-REARM new /obj/item/storage/bag/garment/blueshield(src) new /obj/item/mod/control/pre_equipped/blueshield(src) new /obj/item/sensor_device/blueshield(src)