From 887f667376ed74ddadbb0e2096460ad4c5ea114b Mon Sep 17 00:00:00 2001 From: TaralGit <76408146+TaralGit@users.noreply.github.com> Date: Fri, 24 Dec 2021 14:32:03 +0200 Subject: [PATCH] Deleting the old laser gun and replacing it with the COG (#5664) Co-authored-by: and_a --- Resources/Maps/packedstation.yml | 4 +- .../Weapons/Guns/Battery/battery_guns.yml | 36 +---------------- .../Guns/Battery/laser_gun.rsi/base.png | Bin 353 -> 0 bytes .../Guns/Battery/laser_gun.rsi/icon.png | Bin 375 -> 0 bytes .../Battery/laser_gun.rsi/inhand-left.png | Bin 399 -> 0 bytes .../Battery/laser_gun.rsi/inhand-right.png | Bin 417 -> 0 bytes .../Battery/laser_gun.rsi/mag-unshaded-1.png | Bin 125 -> 0 bytes .../Battery/laser_gun.rsi/mag-unshaded-2.png | Bin 144 -> 0 bytes .../Battery/laser_gun.rsi/mag-unshaded-3.png | Bin 150 -> 0 bytes .../Battery/laser_gun.rsi/mag-unshaded-4.png | Bin 146 -> 0 bytes .../Guns/Battery/laser_gun.rsi/meta.json | 37 ------------------ 11 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml index 5e065b8dc8..96bbadd4a9 100644 --- a/Resources/Maps/packedstation.yml +++ b/Resources/Maps/packedstation.yml @@ -87665,7 +87665,7 @@ entities: - color: '#0000FFFF' type: AtmosPipeColor - uid: 9229 - type: LaserSecGun + type: LaserRifleCog components: - pos: 41.526512,27.667274 parent: 0 @@ -109560,7 +109560,7 @@ entities: - canCollide: False type: Physics - uid: 11192 - type: LaserSecGun + type: LaserRifleCog components: - pos: 41.526512,27.4329 parent: 0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 3af39fcf6b..ccc75b79de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -102,7 +102,7 @@ size: 24 sprite: Objects/Weapons/Guns/Battery/svalinn.rsi - type: BatteryBarrel - fireCost: 20 + fireCost: 25 - type: entity name: cog laser carbine @@ -123,7 +123,7 @@ size: 24 sprite: Objects/Weapons/Guns/Battery/cog.rsi - type: BatteryBarrel - fireCost: 10 + fireCost: 12 - type: entity name: laser cannon @@ -247,35 +247,3 @@ magState: mag steps: 5 zeroVisible: true - -- type: entity - name: laser gun - parent: BatteryGunBase - id: LaserSecGun - description: A laser gun. - components: - - type: Sprite - netsync: false - sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi - layers: - - state: base - map: ["enum.RangedBarrelVisualLayers.Base"] - - state: mag-unshaded-4 - map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] - shader: unshaded - - type: Item - size: 24 - sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi - - type: BatteryBarrel - minAngle: 1 - fireRate: 6 - cellSlot: - ejectOnUse: true - insertSound: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg - soundOptions: - volume: -2 - startingItem: PowerCellMediumStandard - whitelist: - components: - - Battery diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png deleted file mode 100644 index 43d82423383ddfffb5071928b5051acf23c7776e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP|zm8C&U#OFMUBkn}OR}>A0s<^7ERy5mtQb$10o93=1o;Is{Ko{l9wx5@%Fpw3aSW-L^LFAv zp+gEhE|Y_}wrmvr_5c4XwFRN>U!JV(=R33M^n`##lkE@K@aW%~@|)}O3-$aB-xZIz zd2MU#e3lv|BKEL?WsyVjcc;~CW(<-}JJMt|RcHKgbN_61P&_=Ot$x#cA8!IDd@3fSM`*ll9Es7 Yc;Clz{O!Fnu?pm6Pgg&ebxsLQ0GQ;7=Kufz diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png deleted file mode 100644 index ff7a8709f8cd868d5267cdfbbce7f3c7a559d4b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP|zd5C&U#? z$am*@gRT2MvsKFEakt zG3V_q!@L#)0oDuiJ+Ax^x?+-%_dq!y*VmZ+AzwB3xx}3dp9x)AI74LinzC>%rfUL< zf5W2=nLU2_jM)VOrZjcjsK1}M^86L)u8yab^Y(C5i<(w4G90jMx9uv>Dvg!aGY~Wk zjSb}p-MYAIyEi+-0gJvB`?Fe<6pnQ)bqxsZHdGRMxUX!LU)7#9-~WC4Wj}YrkKf!r zp=Yb}{a;)ExRD(E;OC*x(8O74UuydW4$V*R>X@3^sdHK&dC&UuwZ&XYNlHoK3ExE5 z? diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png deleted file mode 100644 index b3d6103648ec1a4fd354129ecaffefe198d8e763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#X#z`z*c>Eakt zG3V_q>vhcr0<0Hit1mq^dx4*DC3{@c>MJIj7q2;Lz2VLV;p?6c!xaP+<2n48b}e_Q zdB$vF%peE>cNcB-yWgiceSf-o#@gUOk#5aHH!S4E7Wl?#evJ$9R#x)No?GCs>6+f6 z&)+lFPVTsK_TejDfr%nc4f?iA1dd32cAMe&-}u8)cMitT(7o4AZ2PPelLIBx<7?~TfYCcWl(7OU@={JmY43*+v~H6 zt(aDy>h3@Qy9D3n$;*E;I^Vw|e&XYqi>wR`OGWHrTef|$KOA-2H&*`a{rgj^!xJw_ zGcXvs-Iy$EUoXFK)vCPkgY$Bx#kP9>XJ9Bemz&fx!Rdi_|E_iE{Oi`e?snyUe&UM&2mdKI;Vst E0P!icMF0Q* diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png deleted file mode 100644 index 43de02d5afe00166c9700f80cce7aafc6002e47b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@=ZKl977^n z-=5vbdq6>eM0JYD@<);T3K0RXQrCfxu4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png deleted file mode 100644 index 3e6690995beb7016e9be7b48d4950b3580ca97ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK^4&dM977^n z-=5vb+h8Ez9C+VsqLOQlY}6)i6}N@OT4FntSpQt#u}PPa;h)~7ql;U;x4x6qx@uKj or=1$}>G6lz(dQW%80=CRCtC<^5p6iR4QM2Tr>mdKI;Vst0JX&}DF6Tf diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png deleted file mode 100644 index 197a0cac6994ea8d48f7fefc944753a1679df1c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@_jvB977^n zlM^IZ7bl4HGzA)5VpP5<^>yZd?u@^wKMHzhGP?cW|6_X2XAicx*%JTK|EB-w_gTF9 nbP0l+XkKTDmam diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png deleted file mode 100644 index 3f7c3289ddaebf48b3eba4b8b40d02beb6f506da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;yCW977^n z-<~lPY%maExp?-7L&=2)%$gF5-FeIoFnkWa=%_Y%TJ71eas|&{yG?B76i<2i%*rU= rcKgTodZ+!?IM#?hSgGPUDN3t*j>5N?8zwD4Lm50>{an^LB{Ts5h#D}* diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json deleted file mode 100644 index f405b7d296..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/3b42532472e7cc1e65bba9d166c27ab6f7ea89b5", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -}