From 08f44050fe81b7bfc53932ad31783b6af4d926b8 Mon Sep 17 00:00:00 2001 From: TaralGit <76408146+TaralGit@users.noreply.github.com> Date: Mon, 15 Mar 2021 02:53:16 -0700 Subject: [PATCH] Laser gun for security (#3632) * laser gun * filled up the energy depletion overlay * small sprite correction Co-authored-by: and_a --- .../Weapons/Guns/Battery/battery_guns.yml | 39 ++++++++++++++++++ .../Guns/Battery/laser_gun.rsi/base.png | Bin 0 -> 589 bytes .../Guns/Battery/laser_gun.rsi/icon.png | Bin 0 -> 646 bytes .../Battery/laser_gun.rsi/inhand-left.png | Bin 0 -> 399 bytes .../Battery/laser_gun.rsi/inhand-right.png | Bin 0 -> 417 bytes .../Battery/laser_gun.rsi/mag-unshaded-1.png | Bin 0 -> 110 bytes .../Battery/laser_gun.rsi/mag-unshaded-2.png | Bin 0 -> 117 bytes .../Battery/laser_gun.rsi/mag-unshaded-3.png | Bin 0 -> 117 bytes .../Battery/laser_gun.rsi/mag-unshaded-4.png | Bin 0 -> 129 bytes .../Guns/Battery/laser_gun.rsi/meta.json | 37 +++++++++++++++++ 10 files changed, 76 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json 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 5790c3141a..e853d05048 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -159,3 +159,42 @@ magState: mag steps: 5 zeroVisible: true + +- type: entity + name: laser gun + parent: BaseItem + id: LaserSecGun + description: Standard issued laser carbine for Nanotrasen security operatives. + 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: RangedWeapon + - type: BatteryBarrel + minAngle: 10 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 45 + currentSelector: Single + allSelectors: + - Single + fireRate: 6 + powerCellPrototype: PowerCellMediumStandard + powerCellRemovable: true + ammoPrototype: RedLaser + soundGunshot: /Audio/Weapons/Guns/Gunshots/laser.ogg + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 5 + zeroVisible: false 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 new file mode 100644 index 0000000000000000000000000000000000000000..dfb67426ea04fd8aaea43b011759aa0bffd57f99 GIT binary patch literal 589 zcmV-T0P^?_E@u<13t-ze(wEuF`Niuue7(Bj>EU6_ zehS{N=5$}a!?tZq)7*j&heLAZaygQujA!7aR^!9P1*)pXz)8-1U7}`$pQt4vP1As7y~Q%H zu71BCtKzraZuFo~U^ZK3U_PItC<=qYAP39aADM;L~j zou8ws>J}VeI2vv3bTAm?+U<6<*)MkcCoABv;~MUQYnm1{8Vzo5ZU`0&=JWZ^$EMkA zMgTz&Bz}zcPWqQ{fPB)4cPTAAbpQf*UpOTE8Hr<3C-9eOdY8DnEmYGIU~#&#WEy!vN| z;Gf{lvlnlkcj%$)U>R-PbjZSB)avZn-k7{hpj~YY@pi-#> zskChyP1A53hio<*SRu!8uH95olqhTfSi=(&;pYVcsb>wa* zaDK44&6i$}`CKk!Ke_LMH9H$msMqUMtJMj(X`0-UB9$;nAjrUSi5Dxc5$vOMg?)s+?AA044-S_mAa?xPYtBm6`!3F*2H z4ErsVfl=-4?S;Dd(aw%PGdmlUWiS|^sw#~}BL&0Tp(qNj>rMnR{w=a#SyoC?6ouX0 zT|CcYzu837vSI$Z7JUHMbt6AU*Dm^(Z~!Ul!apf4JazyAcvCn;{27TdoSvReosSET9DoQylBOpt gE<919M2P@?0)0y>-?oqezyJUM07*qoM6N<$g6Byuu>b%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6dae4d7646ab42aa44419dcb475117dad712b155 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#X#z`*F{>Eakt 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? literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..b3d6103648ec1a4fd354129ecaffefe198d8e763 GIT binary patch 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* literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..1277964047adb789cb1ccdc7d62dda8a9d48c668 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@>M-u977^n z-=1USWia44u;Hh8;cA7)ikYHY7#^%zS!udoo`K=J?p}H3IYz6SegQQwc)I$ztaD0e F0sv449xVU> literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..6a82939cb78ab59a5edb456b4315c205d862b870 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@^w62977^n z-<~t%Wl#`cIe58`d&$CQD=s+L&CJ|(mxW>3E6?v<@%8^17|xV3T7Khvyo2-VFQ7gK MPgg&ebxsLQ0D=x9f&c&j literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..ca2db4f94649846a3911f4f81e3901a25b2160a7 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@^w62977^n z-<~t%Wl#`cIe58U((}_YM?#_ MPgg&ebxsLQ0D@2>MF0Q* literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..6779c8643d3648e4250cb1b730ee8d5b03f78cd9 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@+~}F977^n z-<~lPWKa+|a$t|}7lUTomIlQ+4UDVuHBOkVeCIG}$#Es?HO;Y7YdE)mJ5ldFN#*ZT ZhT{h~nGR~M6$6^V;OXk;vd$@?2>?-^C>sC( literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000..adf7f0a84d --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 3b42532472e7cc1e65bba9d166c27ab6f7ea89b5", + "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 + } + ] +}