From 43cd9259cb087ae7fe95b7b3a294f86346ba9d3d Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sun, 3 Nov 2024 14:33:01 -0600 Subject: [PATCH 01/38] Merge the wizden stuff Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/arsenal.yml | 171 ++++++++++++---------- 1 file changed, 90 insertions(+), 81 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 1bc89d160b9..14dc17d5d1a 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -15,26 +15,27 @@ # These are roundstart but not replenishable for salvage - type: technology - id: DraconicMunitions - name: research-technology-draconic-munitions + id: BasicShuttleArmament + name: research-technology-basic-shuttle-armament icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi - state: incendiarydisplay + sprite: Structures/Power/cage_recharger.rsi + state: full discipline: Arsenal - tier: 1 - cost: 10000 + tier: 1 #Delta-V moved to T1 + cost: 10500 recipeUnlocks: - - BoxShotgunIncendiary - - MagazineRifleIncendiary - - MagazinePistolIncendiary - - MagazineLightRifleIncendiary - - SpeedLoaderMagnumIncendiary - - MagazineShotgunIncendiary - - MagazineBoxPistolIncendiary - - MagazineBoxMagnumIncendiary - - MagazineBoxLightRifleIncendiary - - MagazineBoxRifleIncendiary - - MagazineBoxSpecialIncendiary # DeltaV + - PowerCageRechargerCircuitboard + - PowerCageSmall + - PowerCageMedium + - MagazineGrenadeEmpty + - GrenadeFlash + - GrenadeBlast + - ShuttleGunSvalinnMachineGunCircuitboard + - ShuttleGunPerforatorCircuitboard + - ShuttleGunFriendshipCircuitboard + technologyPrerequisites: + - SalvageWeapons + - ExplosiveTechnology - type: technology id: WeaponizedLaserManipulation @@ -75,29 +76,7 @@ - MagazineBoxSpecialRubber # End of modified code -- type: technology - id: UraniumMunitions - name: research-technology-uranium-munitions - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: uranium - discipline: Arsenal - tier: 1 - cost: 7500 - recipeUnlocks: - - MagazineRifleUranium - - MagazinePistolUranium - - MagazineLightRifleUranium - - SpeedLoaderMagnumUranium - - MagazineBoxPistolUranium - - MagazineBoxMagnumUranium - - MagazineBoxLightRifleUranium - - MagazineBoxRifleUranium - - BoxShotgunUranium - # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree - - SpeedLoaderSpecialUranium - - MagazineBoxSpecialUranium - # End of modified code + - type: technology id: AdvancedRiotControl @@ -157,57 +136,69 @@ state: icon discipline: Arsenal tier: 2 - cost: 10000 + cost: 12500 #DeltaV- Raised to 12500 from 10000 recipeUnlocks: - WeaponLaserCannon + - WeaponXrayCannon -- type: technology - id: WaveParticleHarnessing - name: research-technology-wave-particle-harnessing - icon: - sprite: Objects/Weapons/Guns/Battery/xray.rsi - state: icon - discipline: Arsenal - tier: 2 - cost: 10000 - recipeUnlocks: - - WeaponXrayCannon - -- type: technology - id: BasicShuttleArmament - name: research-technology-basic-shuttle-armament + - type: technology + id: UraniumMunitions + name: research-technology-uranium-munitions icon: - sprite: Structures/Power/cage_recharger.rsi - state: full + sprite: Objects/Materials/Sheets/other.rsi + state: uranium discipline: Arsenal - tier: 2 - cost: 10500 + tier: 2 #Delta-V moved to t2 + cost: 7500 recipeUnlocks: - - PowerCageRechargerCircuitboard - - PowerCageSmall - - PowerCageMedium - - MagazineGrenadeEmpty - - GrenadeFlash - - GrenadeBlast - - ShuttleGunSvalinnMachineGunCircuitboard - - ShuttleGunPerforatorCircuitboard - - ShuttleGunFriendshipCircuitboard - technologyPrerequisites: - - SalvageWeapons + - MagazineRifleUranium + - MagazinePistolUranium + - MagazineLightRifleUranium + - SpeedLoaderMagnumUranium + - MagazineBoxPistolUranium + - MagazineBoxMagnumUranium + - MagazineBoxLightRifleUranium + - MagazineBoxRifleUranium + - BoxShotgunUranium + # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree + - SpeedLoaderSpecialUranium + - MagazineBoxSpecialUranium + # End of modified code -# Tier 3 +#Delta-V merged with concentrated laser weaponry +#- type: technology +# id: WaveParticleHarnessing +# name: research-technology-wave-particle-harnessing +# icon: +# sprite: Objects/Weapons/Guns/Battery/xray.rsi +# state: icon +# discipline: Arsenal +# tier: 2 +# cost: 10000 + # recipeUnlocks: + #- WeaponXrayCannon - type: technology - id: PortableMicrofusionWeaponry - name: research-technology-portable-microfusion-weaponry + id: DraconicMunitions + name: research-technology-draconic-munitions icon: - sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi - state: icon + sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi + state: incendiarydisplay discipline: Arsenal - tier: 3 - cost: 15000 + tier: 2 #Delta-V moved to t2 + cost: 10000 recipeUnlocks: - - WeaponAdvancedLaser + - BoxShotgunIncendiary + - MagazineRifleIncendiary + - MagazinePistolIncendiary + - MagazineLightRifleIncendiary + - SpeedLoaderMagnumIncendiary + - MagazineShotgunIncendiary + - MagazineBoxPistolIncendiary + - MagazineBoxMagnumIncendiary + - MagazineBoxLightRifleIncendiary + - MagazineBoxRifleIncendiary + - MagazineBoxSpecialIncendiary # DeltaV - type: technology id: ExperimentalBatteryAmmo @@ -216,11 +207,12 @@ sprite: Objects/Weapons/Guns/Battery/svalinn.rsi state: icon discipline: Arsenal - tier: 3 + tier: 2 #Delta-V moved to t2 cost: 15000 recipeUnlocks: - WeaponLaserSvalinn + - type: technology id: AdvancedShuttleWeapon name: research-technology-advanced-shuttle-weapon @@ -228,7 +220,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi state: icon discipline: Arsenal - tier: 3 + tier: 2 cost: 15000 recipeUnlocks: - GrenadeEMP @@ -236,3 +228,20 @@ - ShuttleGunDusterCircuitboard technologyPrerequisites: - BasicShuttleArmament + +# Tier 3 + +- type: technology + id: PortableMicrofusionWeaponry + name: research-technology-portable-microfusion-weaponry + icon: + sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi + state: icon + discipline: Arsenal + tier: 3 + cost: 15000 + recipeUnlocks: + - WeaponAdvancedLaser + + + From 4ad106ebc0f862938cb30ce1fd3f8c405bd7b22f Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sun, 3 Nov 2024 14:36:40 -0600 Subject: [PATCH 02/38] Update the delta techs Signed-off-by: Stop-Signs --- .../Prototypes/DeltaV/Research/arsenal.yml | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 17bcc254bc6..9ecf7b2a690 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -32,24 +32,26 @@ id: EnergyGunsAdvanced name: research-technology-energy-gun-advance icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi - state: icon - discipline: Arsenal - tier: 2 - cost: 7500 - recipeUnlocks: - - WeaponEnergyGunPistol - -- type: technology - id: Advanced Laser Manipulation - name: research-technology-advance-laser - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi #changed sprite to ik-60 state: icon discipline: Arsenal tier: 2 cost: 12500 recipeUnlocks: + - WeaponEnergyGunPistol - WeaponGunLaserCarbineAutomatic +#Merged with EnergyGunsAdvanced +#- type: technology +# id: Advanced Laser Manipulation +# name: research-technology-advance-laser +# icon: +# sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi +# state: icon +# discipline: Arsenal +# tier: 2 + # cost: 12500 +# recipeUnlocks: +# - WeaponGunLaserCarbineAutomatic + From febb4a80e9a482cfbe2046541cf0d2f8fcf498e1 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sun, 3 Nov 2024 17:52:25 -0600 Subject: [PATCH 03/38] Upload resprites Signed-off-by: Stop-Signs --- .../Advanced trunch/equipped-BACKPACK.png | Bin 0 -> 723 bytes .../Weapons/Melee/Advanced trunch/icon.png | Bin 0 -> 360 bytes .../Melee/Advanced trunch/inhand-left.png | Bin 0 -> 513 bytes .../Melee/Advanced trunch/inhand-right.png | Bin 0 -> 513 bytes .../Advanced trunch/wielded-inhand-left.png | Bin 0 -> 522 bytes .../Advanced trunch/wielded-inhand-right.png | Bin 0 -> 519 bytes .../Textures/Objects/Weapons/Melee/meta.json | 34 ++++++++++++++++++ 7 files changed, 34 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Melee/Advanced trunch/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/Advanced trunch/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/Advanced trunch/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/Advanced trunch/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/meta.json diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..26536db36fbe36d0eb1beed760a46f22251e3c6a GIT binary patch literal 723 zcmV;^0xbQBP)Px%jY&j7RCr$Pn!ic|K@i3_Nc@9nqxcXfR`CgJ0#@l#q_VKEh}JQ^rJyM+EUYZj zC5;dyc?(lpi(*hDYLJx)u7tqd&Ft=N_AX;%GrRN6@B8jf+|7wO|H;ky{DJ{+0_L0m zKLV%#1QjXzx9Ng~)QlP`zj-W2TQ4Ft5Q2)#KW&K7^JVOOu>~q2sewQk9%e%WfMS3E zzcFM{kCyEs;_zeuQF^Zr_Qr4yZ+axC6b4Z}>b06|wcFyM-zW7a6-S9}9u?)==g0|w zY0$fcf*cNqqQX$UVO{a8soh(9p)CQ_!J%Ho{=Bp^UT$K57J$hJ zx^})=t;$}v`yYGLN01C)`X!{}pzfOK;nhASFJTe@^&L+7dmjd9I|yXhcV721tOX#+ zKX!D}0qejZsx}e;6LG$-WdOc9<4PANz!hm<`)~q$b;gx0PJk=YzV_h+`09)+U7P?{ zqu1NdZhZEqdGp=-T0$h>ywGS=<$m=GF4w;Y!6aXJ?hs0^n`Ik5t zh5`VEaRL%`|8Mg!4eGQ?=Xf3s05hPj3z)sbYScNU?(w`e0J=w0Cd1n}p0@&E76+!v z`IXhR+1w9M&dp+Y)pKca!T4f^Q34=>gV({Bg{$i^wt*W1fZ_NpTxDrA8l=5#4~E^3BocESHtHG+R+MQS#Q+ijQ(-RF zQw_)*04ih#KqZ#7dQL#r9Hq{~37`_oT0JKqYmQRq`2|+wK~P^96z2c{002ovPDHLk FV1kx;K~ew! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/icon.png b/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d665a4503ad7cdc009a8a0c9bd2019871719fd7e GIT binary patch literal 360 zcmV-u0hj)XP)Px$B1uF+R9HvtmOl=HFciigg9C$!i8YQ5XTUqKag^S`OK=Qt;BIh{12_qBQ{v{t zP*dX{NGP=BwJdag>G%6y-uqe)Mn2xi`Y-`Z9kAK~N-19v0;epK>R18Tgdx9|B{0Sy zNfPLSumT{Q3-LV9;h3f%V2Yw>)j|cRJ691G8H5VZ=G@5)m^l9?FiHnZoTC5?agG8o z#Q7iq4CjLYFq|6!U^+Jfz;vz+pcAh;zbxe(5CCx;|FXR=;Zz~i0D_2vPk=rT?|Wqr zi>he7t{>ndKD#ZUDwFW_tU`80P=4XJ*9(~=E05n$^rQDfQ8SM*iiSr>&aM3>i0000Px$yGcYrRCr$PnoUl_Fc5_u1UCpv2uDDabL0+OAcx5XxI@lC5l0}fBsVC+Xcm#G ziqhJC9{J~WlSS>B=Wm{!s-DJF{%I;-zaaoRpmGA-0+kzphak5Aw?O3txCKHC&~=@a z`SUzy3o=N!02qeBjN_OsgdhM?{oEl016U#SeQ%~|%FYQ8069Z|0mu~s6u=7Mx^2zN zb_dg=ovuAjj{#MA`fkgj1LEZ6!+f& zjmiTD@VMF7uVqnbl@SP`y$Ems+Pwjx`QQLFepejJ;nPb{3;^G2_+kKvD|{dn1z?3B z&vSbbiUZ(!1`&WOvC_uV0i{*cbv<-|E3wkXSMPvd?5NN|#(1kA00000NkvXXu0mjf DHB#Di literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..77258a430948203ec4d13202922f64e90ebdd456 GIT binary patch literal 513 zcmV+c0{;DpP)Px$yGcYrRCr$PnlWm`Fc3xMB4r2!r;Q7fOyMwv zAuQ{)WPPnQ(%;(pn*ZjHy&x4P^Iws=IgpPUDv7Z{51Mb08%sWlz>gZUj=l@M;q zW*oow=JEE~%r)|?u@uZtiCThi7Jw`g0j-@s9j8lvR7M;5z90Z3O^sSifX1#NYi0tF zG&O250UEo8teFWw($uKM1ZeCUvSua#NmHX16QHqc$eNh|Bu$N4OaQuTh&uxa4O?H( z1fY)1Q93pdU;xlXqxDuDjoA>CXF{DEhtgejI64O-bdjO;y+$B(aTD~A`*;Dk=A8k7 z@KBcKa6Ed|e41o0v1{KM2(h0tfTiDYW~fHi;=%?ku;0IA&>a85uh zGmEanIsxd7W6>jkSURy)9ZbMhF35cZ=Th;Lg?{e2chXoP<00000NkvXXu0mjf D*5KQx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..700a5349f5f0cf97333d2023637fbe81c3451f00 GIT binary patch literal 522 zcmV+l0`>igP)Px$#7RU!RCr$Pnz2%YKoEvEMG9jnT0);TcFL3F9efzy!6(7e6gKupsaP6|6gbPw zk%1xRAh$Q{+@FTbaP0m2@3&CwEhzHeBJ%tR27rLb9Y7024gg+)XaTf9-Joz5KkP zL-p)T+cJ5o4|m^0{a6#KbuO<~RF-8mC(Q}jt1+e{dT0%=eK!xSw0@$T4Bs4Uz}RO_ zd2=o==c-IFU&SLZKt-7ZMS=i9b5(=}0V>KQC=vt+nyVr-2vAWbL6IOp&|DRvL4b-f z35o;(g666S4FXh@Nl+vR5HwdsXb_;HOoAdofS|c5LW2MmWfBw#0$k0#-)!ou)ryLu z2x=NncYpW$MrMCn?W+C1bV(kt2WBanK@!O4G5`Po M07*qoM6N<$f>~(V#{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e40b87bff7bc5e044e4c5a7b966c937fe269a767 GIT binary patch literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4|=*dhE&A8 zjoKU3>>zMYM6+k(peIBw9YYp zQ)_bOK>6`qU5WU*|K#;fXSslA5$w{uNf z9?n{4u{Cja>{gpQ7k1XX@~M9AEY={smHlLKUHSYySD(1D?0jB%Z^cX%PoUbWbrx$G zYGao0?PH8`UHfn%Lv~-*PX)%Pqid+ZuJB}d|K*d*y0F#uyN}-D%=(Zy>sqbI%KW-xb`im-Sxp+fI8=rKK;u9;ks{66~V@xu&7-Q65vtFNkVCCLt$_GN0 z**;cmP)|$`7UP`J8#+&|i={%S%q(?c!_A1NnTzayWzKTEzSaIbFlHG%UHx3vIVCg! E0Fg%Ib^rhX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/meta.json b/Resources/Textures/Objects/Weapons/Melee/meta.json new file mode 100644 index 00000000000..f8637ed691f --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Findorsal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} From fc0dda248c62f5102c1074c963cf9234cf65d921 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sun, 3 Nov 2024 18:13:32 -0600 Subject: [PATCH 04/38] Adds the weapon prototype Signed-off-by: Stop-Signs --- .../Weapons/Melee/Advanced Truncheon.yml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/Advanced Truncheon.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/Advanced Truncheon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/Advanced Truncheon.yml new file mode 100644 index 00000000000..1de01c98ee0 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/Advanced Truncheon.yml @@ -0,0 +1,33 @@ +- type: entity + name: Advanced Truncheon + parent: BaseItem + id: AdvancedTruncheon + description: If all else fails, BONK! + components: + - type: Sprite + sprite: Objects/Weapons/Melee/Advanced trunch + state: icon + - type: Item + size: Normal + - type: MeleeWeapon + attackRate: 0.75 + range: 1.75 + damage: + types: + Blunt: 16 + soundHit: + path: /Audio/Nyanotrasen/Weapons/club.ogg + bluntStaminaDamageFactor: 1.60 # 25.6 stamina damage +# - type: MeleeStaminaCost +# swing: 10 +# wieldCoefficient: 0.35 #if wielded you will only consume 3.5 stam its a weapon after all + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 14 + - type: Clothing + sprite: Objects/Weapons/Melee/Advanced trunch + quickEquip: false + slots: + - back From 6eda8b9dbf55029ed06a216eb3616d9fcf65be46 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sun, 3 Nov 2024 18:17:36 -0600 Subject: [PATCH 05/38] adds the recipe in the seclathe Signed-off-by: Stop-Signs --- Resources/Prototypes/Recipes/Lathes/security.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 5a7ad143ac7..ebe75a8ddbe 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -657,6 +657,16 @@ Plastic: 100 Glass: 20 + - type: latheRecipe + parent: BaseWeaponRecipe + id: AdvancedTruncheon + result: AdvancedTruncheon + completetime: 5 + Materials: + Steel: 1000 + Plastic: 800 + + # DeltaV: removed, idk why #- type: latheRecipe # id: PortableRecharger From 1b114ce8bc66f2af64e755229d827a49e2e8e0f2 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sun, 3 Nov 2024 19:32:25 -0600 Subject: [PATCH 06/38] fully integrates the AT Signed-off-by: Stop-Signs --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 9ecf7b2a690..e7610fb6e55 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -41,6 +41,18 @@ - WeaponEnergyGunPistol - WeaponGunLaserCarbineAutomatic +- type: technology + id: RobustMelee + name: research-technology-robust-melee + icon: + sprite: Objects/Weapons/Melee/Advanced trunch + state: icon + discipline: Arsenal + tier: 3 + Cost: 12500 + recipeUnlocks: + - AdvancedTruncheon + #Merged with EnergyGunsAdvanced #- type: technology # id: Advanced Laser Manipulation From a23c926a03a435d28d6997cd0c7077fb79b28c44 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Mon, 4 Nov 2024 18:18:09 -0600 Subject: [PATCH 07/38] fixeds the yaml error Signed-off-by: Stop-Signs --- Resources/Prototypes/Recipes/Lathes/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index ebe75a8ddbe..f9ec8b89601 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -657,7 +657,7 @@ Plastic: 100 Glass: 20 - - type: latheRecipe +- type: latheRecipe parent: BaseWeaponRecipe id: AdvancedTruncheon result: AdvancedTruncheon From 103a39303976e551380be7c9f20a58d4c116a7c1 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Mon, 4 Nov 2024 20:27:57 -0600 Subject: [PATCH 08/38] Im dumb and dont know proper spacing Signed-off-by: Stop-Signs --- Resources/Prototypes/Recipes/Lathes/security.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index f9ec8b89601..f1d9d304fb9 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -666,7 +666,6 @@ Steel: 1000 Plastic: 800 - # DeltaV: removed, idk why #- type: latheRecipe # id: PortableRecharger From 56143b89f5bddc87da77c8e0f910b6fbada84d3b Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Mon, 4 Nov 2024 20:28:48 -0600 Subject: [PATCH 09/38] Im dumb and dont know proper spacing pt2 Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/arsenal.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 14dc17d5d1a..c77cc4e7459 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -77,7 +77,6 @@ # End of modified code - - type: technology id: AdvancedRiotControl name: research-technology-advanced-riot-control From 57d9babb7efdced1801679a1654134db428a4dbe Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Mon, 4 Nov 2024 20:30:16 -0600 Subject: [PATCH 10/38] im silly Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index c77cc4e7459..dbaed14bfd9 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -140,7 +140,7 @@ - WeaponLaserCannon - WeaponXrayCannon - - type: technology +- type: technology id: UraniumMunitions name: research-technology-uranium-munitions icon: From dbbc5b53a199b25dc7b1275d399e2b309d95472e Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Mon, 4 Nov 2024 20:30:49 -0600 Subject: [PATCH 11/38] im silly pt2 Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/arsenal.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index dbaed14bfd9..0537fc2cec5 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -243,4 +243,3 @@ - WeaponAdvancedLaser - From a1faa941f67ed5069725ca607619d9a715ddaec8 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 10:23:52 -0600 Subject: [PATCH 12/38] Moves the texture file and renames it --- .../advanced_truncheon.rsi}/equipped-BACKPACK.png | Bin .../Weapons/Melee/advanced_truncheon.rsi}/icon.png | Bin .../Melee/advanced_truncheon.rsi}/inhand-left.png | Bin .../Melee/advanced_truncheon.rsi}/inhand-right.png | Bin .../advanced_truncheon.rsi}/wielded-inhand-left.png | Bin .../wielded-inhand-right.png | Bin 6 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/{Objects/Weapons/Melee/Advanced trunch => DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi}/equipped-BACKPACK.png (100%) rename Resources/Textures/{Objects/Weapons/Melee/Advanced trunch => DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi}/icon.png (100%) rename Resources/Textures/{Objects/Weapons/Melee/Advanced trunch => DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi}/inhand-left.png (100%) rename Resources/Textures/{Objects/Weapons/Melee/Advanced trunch => DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi}/inhand-right.png (100%) rename Resources/Textures/{Objects/Weapons/Melee/Advanced trunch => DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi}/wielded-inhand-left.png (100%) rename Resources/Textures/{Objects/Weapons/Melee/Advanced trunch => DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi}/wielded-inhand-right.png (100%) diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/Advanced trunch/equipped-BACKPACK.png rename to Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/Advanced trunch/icon.png rename to Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/Advanced trunch/inhand-left.png rename to Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/Advanced trunch/inhand-right.png rename to Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-left.png rename to Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/Advanced trunch/wielded-inhand-right.png rename to Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-right.png From 84add279ecaccd130ecf7ae99a9b755034f9448b Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 10:28:35 -0600 Subject: [PATCH 13/38] Fixes more yml and sprites --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 2 +- .../Melee/{Advanced Truncheon.yml => advanced_truncheon.yml} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Resources/Prototypes/Entities/Objects/Weapons/Melee/{Advanced Truncheon.yml => advanced_truncheon.yml} (92%) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index e7610fb6e55..3e2819fc502 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -45,7 +45,7 @@ id: RobustMelee name: research-technology-robust-melee icon: - sprite: Objects/Weapons/Melee/Advanced trunch + sprite: DeltaV\Objects\Weapons\Melee\advanced_truncheon.rsi state: icon discipline: Arsenal tier: 3 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/Advanced Truncheon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml similarity index 92% rename from Resources/Prototypes/Entities/Objects/Weapons/Melee/Advanced Truncheon.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml index 1de01c98ee0..bc34aaa3f76 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/Advanced Truncheon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml @@ -5,7 +5,7 @@ description: If all else fails, BONK! components: - type: Sprite - sprite: Objects/Weapons/Melee/Advanced trunch + sprite: DeltaV\Objects\Weapons\Melee\advanced_truncheon.rsi state: icon - type: Item size: Normal From 53754011b869e7dbcaa1dcdbf19c548e732a0cae Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 10:40:36 -0600 Subject: [PATCH 14/38] Update advanced_truncheon.yml --- .../Entities/Objects/Weapons/Melee/advanced_truncheon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml index bc34aaa3f76..ed5e95ea161 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml @@ -27,7 +27,7 @@ types: Blunt: 14 - type: Clothing - sprite: Objects/Weapons/Melee/Advanced trunch + sprite: DeltaV\Objects\Weapons\Melee\advanced_truncheon.rsi quickEquip: false slots: - back From f687fe04e5b0196b719b50579c77d936972faa45 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 11:17:11 -0600 Subject: [PATCH 15/38] added the .json --- .../Melee/advanced_truncheon.rsi/meta.json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/meta.json new file mode 100644 index 00000000000..f8637ed691f --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Findorsal", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} From 2c16c8a40e10a8a77b4fed3dc311f1ef013cf982 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 11:43:08 -0600 Subject: [PATCH 16/38] PLEASE FIX THE YML --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 2 +- .../Entities/Objects/Weapons/Melee/advanced_truncheon.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 3e2819fc502..18f2951872c 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -45,7 +45,7 @@ id: RobustMelee name: research-technology-robust-melee icon: - sprite: DeltaV\Objects\Weapons\Melee\advanced_truncheon.rsi + sprite: DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi state: icon discipline: Arsenal tier: 3 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml index ed5e95ea161..18e85e07a09 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml @@ -5,7 +5,7 @@ description: If all else fails, BONK! components: - type: Sprite - sprite: DeltaV\Objects\Weapons\Melee\advanced_truncheon.rsi + sprite: DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi state: icon - type: Item size: Normal @@ -27,7 +27,7 @@ types: Blunt: 14 - type: Clothing - sprite: DeltaV\Objects\Weapons\Melee\advanced_truncheon.rsi + sprite: DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi quickEquip: false slots: - back From dcfae1cba90795d2a72d4009b70268fc844fe7c9 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 12:08:48 -0600 Subject: [PATCH 17/38] suffering --- Resources/Locale/en-US/deltav/research/technologies.ftl | 1 + Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 9 +++++++++ Resources/Prototypes/Recipes/Lathes/security.yml | 9 --------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl b/Resources/Locale/en-US/deltav/research/technologies.ftl index b9a37b97454..91ba2b42b75 100644 --- a/Resources/Locale/en-US/deltav/research/technologies.ftl +++ b/Resources/Locale/en-US/deltav/research/technologies.ftl @@ -4,3 +4,4 @@ research-technology-exotic-ammunition = Exotic Ammunition research-technology-energy-gun = Energy Guns research-technology-energy-gun-advance = Advanced Energy Manipulation research-technology-advance-laser = Advanced Laser Manipulation +research-technology-robust-melee = Robust Melee \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index accf075c967..fd04e2f28b5 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -209,3 +209,12 @@ Gold: 250 Silver: 100 Plasma: 500 + +- type: latheRecipe + parent: BaseWeaponRecipe + id: AdvancedTruncheon + result: AdvancedTruncheon + completetime: 5 + materials: + Steel: 1000 + Plastic: 800 diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index f1d9d304fb9..5a7ad143ac7 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -657,15 +657,6 @@ Plastic: 100 Glass: 20 -- type: latheRecipe - parent: BaseWeaponRecipe - id: AdvancedTruncheon - result: AdvancedTruncheon - completetime: 5 - Materials: - Steel: 1000 - Plastic: 800 - # DeltaV: removed, idk why #- type: latheRecipe # id: PortableRecharger From 978887f6ff693e6ca50c4689bea4acb34b6623d2 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 12:15:42 -0600 Subject: [PATCH 18/38] punctuation matters --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 18f2951872c..8ad1aaed7ff 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -49,7 +49,7 @@ state: icon discipline: Arsenal tier: 3 - Cost: 12500 + cost: 12500 recipeUnlocks: - AdvancedTruncheon From bb9c4dd7d5a71d5d69360d3322f3f2d70b78d681 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 12:42:47 -0600 Subject: [PATCH 19/38] Update technologies.ftl Signed-off-by: Stop-Signs --- Resources/Locale/en-US/deltav/research/technologies.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl b/Resources/Locale/en-US/deltav/research/technologies.ftl index 91ba2b42b75..25377b155f8 100644 --- a/Resources/Locale/en-US/deltav/research/technologies.ftl +++ b/Resources/Locale/en-US/deltav/research/technologies.ftl @@ -4,4 +4,4 @@ research-technology-exotic-ammunition = Exotic Ammunition research-technology-energy-gun = Energy Guns research-technology-energy-gun-advance = Advanced Energy Manipulation research-technology-advance-laser = Advanced Laser Manipulation -research-technology-robust-melee = Robust Melee \ No newline at end of file +research-technology-robust-melee = Robust Melee From 791e055bcef51964c6184b8f281a09ff4da5c3ad Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 12:43:08 -0600 Subject: [PATCH 20/38] Update arsenal.yml Signed-off-by: Stop-Signs --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 8ad1aaed7ff..ff2bfa53281 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -32,7 +32,7 @@ id: EnergyGunsAdvanced name: research-technology-energy-gun-advance icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi #changed sprite to ik-60 + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi state: icon discipline: Arsenal tier: 2 From 6a3f89bced38303608f0d8f678c12cdd9a8c5efb Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 12:43:39 -0600 Subject: [PATCH 21/38] Update arsenal.yml Signed-off-by: Stop-Signs --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index ff2bfa53281..ab16bf81019 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -41,7 +41,7 @@ - WeaponEnergyGunPistol - WeaponGunLaserCarbineAutomatic -- type: technology +- type: technology id: RobustMelee name: research-technology-robust-melee icon: From c5fda503a4808ef370417f2d8fbb51d551a4708f Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 12:44:11 -0600 Subject: [PATCH 22/38] Update arsenal.yml Signed-off-by: Stop-Signs --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index ab16bf81019..4f2b0c99677 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -52,18 +52,3 @@ cost: 12500 recipeUnlocks: - AdvancedTruncheon - -#Merged with EnergyGunsAdvanced -#- type: technology -# id: Advanced Laser Manipulation -# name: research-technology-advance-laser -# icon: -# sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi -# state: icon -# discipline: Arsenal -# tier: 2 - # cost: 12500 -# recipeUnlocks: -# - WeaponGunLaserCarbineAutomatic - - From c029e24726976844753ab6a049b3b8bc612f1e63 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 12:44:46 -0600 Subject: [PATCH 23/38] Update advanced_truncheon.yml Signed-off-by: Stop-Signs --- .../Entities/Objects/Weapons/Melee/advanced_truncheon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml index 18e85e07a09..27402e01864 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml @@ -1,7 +1,7 @@ - type: entity - name: Advanced Truncheon parent: BaseItem id: AdvancedTruncheon + name: Advanced Truncheon description: If all else fails, BONK! components: - type: Sprite From 56ffd901a47d22d1a849685cd82efc78f4e165ed Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 12:47:22 -0600 Subject: [PATCH 24/38] Update meta.json Signed-off-by: Stop-Signs --- Resources/Textures/Objects/Weapons/Melee/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Weapons/Melee/meta.json b/Resources/Textures/Objects/Weapons/Melee/meta.json index f8637ed691f..fbe451b9c12 100644 --- a/Resources/Textures/Objects/Weapons/Melee/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/meta.json @@ -1,4 +1,4 @@ -{ + "version": 1, "license": "CC-BY-SA-3.0", "copyright": "Made by Findorsal", From 7446bb83abcd5579f87af0cc65d3ae96abe9b4fa Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 12:50:57 -0600 Subject: [PATCH 25/38] Delete Resources/Textures/Objects/Weapons/Melee/meta.json Signed-off-by: Stop-Signs --- .../Textures/Objects/Weapons/Melee/meta.json | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Melee/meta.json diff --git a/Resources/Textures/Objects/Weapons/Melee/meta.json b/Resources/Textures/Objects/Weapons/Melee/meta.json deleted file mode 100644 index fbe451b9c12..00000000000 --- a/Resources/Textures/Objects/Weapons/Melee/meta.json +++ /dev/null @@ -1,34 +0,0 @@ - - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Findorsal", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - } - ] -} From db9b0a6b5940f0dcf63866eb95832ed3cc6c16de Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 13:02:21 -0600 Subject: [PATCH 26/38] Should fix the ubuntu --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c05b18c2ed1..7f48780fe54 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -434,6 +434,7 @@ - MagazineBoxSpecialUranium - MagazineBoxSpecialHoly - MagazineBoxSpecialMindbreaker + - AdvancedTruncheon # End DeltaV additions - type: entity From 860df388c3958dd211daaa37deb5c7180cf7bc16 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 5 Nov 2024 13:19:41 -0600 Subject: [PATCH 27/38] Emagged protolathe and secfab recipes added fully (i hope :3) --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7f48780fe54..072ef161e61 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -938,6 +938,7 @@ - MagazineBoxSpecialMindbreaker - ClothingOuterHardsuitJuggernautReverseEngineered - ClothingOuterHardsuitSyndieReverseEngineered + - AdvancedTruncheon # End DeltaV additions - type: MaterialStorage whitelist: From 5b36b6abe255422a5d61fc2635c85cec72508baa Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 11:00:50 -0600 Subject: [PATCH 28/38] De-mangle the arsenal.yml --- Resources/Prototypes/Research/arsenal.yml | 167 +++++++++++----------- 1 file changed, 81 insertions(+), 86 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 0537fc2cec5..d701f46a25f 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -15,27 +15,26 @@ # These are roundstart but not replenishable for salvage - type: technology - id: BasicShuttleArmament - name: research-technology-basic-shuttle-armament + id: DraconicMunitions + name: research-technology-draconic-munitions icon: - sprite: Structures/Power/cage_recharger.rsi - state: full + sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi + state: incendiarydisplay discipline: Arsenal - tier: 1 #Delta-V moved to T1 - cost: 10500 + tier: 2 #Delta-V moved to t2 + cost: 10000 recipeUnlocks: - - PowerCageRechargerCircuitboard - - PowerCageSmall - - PowerCageMedium - - MagazineGrenadeEmpty - - GrenadeFlash - - GrenadeBlast - - ShuttleGunSvalinnMachineGunCircuitboard - - ShuttleGunPerforatorCircuitboard - - ShuttleGunFriendshipCircuitboard - technologyPrerequisites: - - SalvageWeapons - - ExplosiveTechnology + - BoxShotgunIncendiary + - MagazineRifleIncendiary + - MagazinePistolIncendiary + - MagazineLightRifleIncendiary + - SpeedLoaderMagnumIncendiary + - MagazineShotgunIncendiary + - MagazineBoxPistolIncendiary + - MagazineBoxMagnumIncendiary + - MagazineBoxLightRifleIncendiary + - MagazineBoxRifleIncendiary + - MagazineBoxSpecialIncendiary # DeltaV - type: technology id: WeaponizedLaserManipulation @@ -76,6 +75,29 @@ - MagazineBoxSpecialRubber # End of modified code +- type: technology + id: UraniumMunitions + name: research-technology-uranium-munitions + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: uranium + discipline: Arsenal + tier: 2 #Delta-V moved to t2 + cost: 7500 + recipeUnlocks: + - MagazineRifleUranium + - MagazinePistolUranium + - MagazineLightRifleUranium + - SpeedLoaderMagnumUranium + - MagazineBoxPistolUranium + - MagazineBoxMagnumUranium + - MagazineBoxLightRifleUranium + - MagazineBoxRifleUranium + - BoxShotgunUranium + # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree + - SpeedLoaderSpecialUranium + - MagazineBoxSpecialUranium + # End of modified code - type: technology id: AdvancedRiotControl @@ -135,69 +157,59 @@ state: icon discipline: Arsenal tier: 2 - cost: 12500 #DeltaV- Raised to 12500 from 10000 + cost: 12500 #Delta-V increased from 10000 recipeUnlocks: - WeaponLaserCannon - - WeaponXrayCannon + - WeaponXrayCannon + +#- type: technology Delta-V merged with concentrated laser weaponry + # id: WaveParticleHarnessing +# name: research-technology-wave-particle-harnessing + # icon: + # sprite: Objects/Weapons/Guns/Battery/xray.rsi + # state: icon + # discipline: Arsenal + # tier: 2 + # cost: 10000 + # recipeUnlocks: + # - WeaponXrayCannon - type: technology - id: UraniumMunitions - name: research-technology-uranium-munitions + id: BasicShuttleArmament + name: research-technology-basic-shuttle-armament icon: - sprite: Objects/Materials/Sheets/other.rsi - state: uranium + sprite: Structures/Power/cage_recharger.rsi + state: full discipline: Arsenal - tier: 2 #Delta-V moved to t2 - cost: 7500 + tier: 1 #Delta-V moved to T1 + cost: 10500 recipeUnlocks: - - MagazineRifleUranium - - MagazinePistolUranium - - MagazineLightRifleUranium - - SpeedLoaderMagnumUranium - - MagazineBoxPistolUranium - - MagazineBoxMagnumUranium - - MagazineBoxLightRifleUranium - - MagazineBoxRifleUranium - - BoxShotgunUranium - # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree - - SpeedLoaderSpecialUranium - - MagazineBoxSpecialUranium - # End of modified code + - PowerCageRechargerCircuitboard + - PowerCageSmall + - PowerCageMedium + - MagazineGrenadeEmpty + - GrenadeFlash + - GrenadeBlast + - ShuttleGunSvalinnMachineGunCircuitboard + - ShuttleGunPerforatorCircuitboard + - ShuttleGunFriendshipCircuitboard + technologyPrerequisites: + - SalvageWeapons + - ExplosiveTechnology -#Delta-V merged with concentrated laser weaponry -#- type: technology -# id: WaveParticleHarnessing -# name: research-technology-wave-particle-harnessing -# icon: -# sprite: Objects/Weapons/Guns/Battery/xray.rsi -# state: icon -# discipline: Arsenal -# tier: 2 -# cost: 10000 - # recipeUnlocks: - #- WeaponXrayCannon +# Tier 3 - type: technology - id: DraconicMunitions - name: research-technology-draconic-munitions + id: PortableMicrofusionWeaponry + name: research-technology-portable-microfusion-weaponry icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi - state: incendiarydisplay + sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi + state: icon discipline: Arsenal - tier: 2 #Delta-V moved to t2 - cost: 10000 + tier: 3 + cost: 15000 recipeUnlocks: - - BoxShotgunIncendiary - - MagazineRifleIncendiary - - MagazinePistolIncendiary - - MagazineLightRifleIncendiary - - SpeedLoaderMagnumIncendiary - - MagazineShotgunIncendiary - - MagazineBoxPistolIncendiary - - MagazineBoxMagnumIncendiary - - MagazineBoxLightRifleIncendiary - - MagazineBoxRifleIncendiary - - MagazineBoxSpecialIncendiary # DeltaV + - WeaponAdvancedLaser - type: technology id: ExperimentalBatteryAmmo @@ -211,7 +223,6 @@ recipeUnlocks: - WeaponLaserSvalinn - - type: technology id: AdvancedShuttleWeapon name: research-technology-advanced-shuttle-weapon @@ -219,7 +230,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi state: icon discipline: Arsenal - tier: 2 + tier: 2 #Delta-V moved to t2 cost: 15000 recipeUnlocks: - GrenadeEMP @@ -227,19 +238,3 @@ - ShuttleGunDusterCircuitboard technologyPrerequisites: - BasicShuttleArmament - -# Tier 3 - -- type: technology - id: PortableMicrofusionWeaponry - name: research-technology-portable-microfusion-weaponry - icon: - sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi - state: icon - discipline: Arsenal - tier: 3 - cost: 15000 - recipeUnlocks: - - WeaponAdvancedLaser - - From fa7233b93cf58291542947773fc55a06b19c424f Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:22:00 +0000 Subject: [PATCH 29/38] make comments less evil Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- Resources/Prototypes/Research/arsenal.yml | 33 ++++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index d701f46a25f..7b7b9d279d1 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -21,7 +21,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi state: incendiarydisplay discipline: Arsenal - tier: 2 #Delta-V moved to t2 + tier: 2 #Delta-V moved to t2 from t1 cost: 10000 recipeUnlocks: - BoxShotgunIncendiary @@ -82,7 +82,7 @@ sprite: Objects/Materials/Sheets/other.rsi state: uranium discipline: Arsenal - tier: 2 #Delta-V moved to t2 + tier: 2 #Delta-V moved to t2 from t1 cost: 7500 recipeUnlocks: - MagazineRifleUranium @@ -157,22 +157,23 @@ state: icon discipline: Arsenal tier: 2 - cost: 12500 #Delta-V increased from 10000 + cost: 12500 # DeltaV: increased from 10000 recipeUnlocks: - WeaponLaserCannon - WeaponXrayCannon -#- type: technology Delta-V merged with concentrated laser weaponry - # id: WaveParticleHarnessing +# DeltaV: merged with concentrated laser weaponry +#- type: technology +# id: WaveParticleHarnessing # name: research-technology-wave-particle-harnessing - # icon: - # sprite: Objects/Weapons/Guns/Battery/xray.rsi - # state: icon - # discipline: Arsenal - # tier: 2 - # cost: 10000 - # recipeUnlocks: - # - WeaponXrayCannon +# icon: +# sprite: Objects/Weapons/Guns/Battery/xray.rsi +# state: icon +# discipline: Arsenal +# tier: 2 +# cost: 10000 +# recipeUnlocks: +# - WeaponXrayCannon - type: technology id: BasicShuttleArmament @@ -181,7 +182,7 @@ sprite: Structures/Power/cage_recharger.rsi state: full discipline: Arsenal - tier: 1 #Delta-V moved to T1 + tier: 1 # DeltaV: moved to T1 from t2 cost: 10500 recipeUnlocks: - PowerCageRechargerCircuitboard @@ -218,7 +219,7 @@ sprite: Objects/Weapons/Guns/Battery/svalinn.rsi state: icon discipline: Arsenal - tier: 2 #Delta-V moved to t2 + tier: 2 # DeltaV: moved to t2 from t3 cost: 15000 recipeUnlocks: - WeaponLaserSvalinn @@ -230,7 +231,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi state: icon discipline: Arsenal - tier: 2 #Delta-V moved to t2 + tier: 2 # DeltaV: moved to t2 from t3 cost: 15000 recipeUnlocks: - GrenadeEMP From a822e9401f33554ff66f4193f1e543a9eaf7ae1c Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 17:12:32 -0600 Subject: [PATCH 30/38] should fix conflicts --- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 5 +++++ Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 + 2 files changed, 6 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index fd04e2f28b5..379a84b7e6d 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -218,3 +218,8 @@ materials: Steel: 1000 Plastic: 800 + +- type: latheRecipe + parent: ClothingShoesBootsMagSci + id: ClothingShoesBootsSecurityMagboots + result: ClothingShoesBootsSecurityMagboots diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 072ef161e61..006d72db5c9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -939,6 +939,7 @@ - ClothingOuterHardsuitJuggernautReverseEngineered - ClothingOuterHardsuitSyndieReverseEngineered - AdvancedTruncheon + - ClothingShoesBootsSecurityMagboots # End DeltaV additions - type: MaterialStorage whitelist: From 80d1dad0f18519fff2e405f7ab50cd0a5b2f2fbb Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 17:16:53 -0600 Subject: [PATCH 31/38] merge conflicts --- .../Prototypes/DeltaV/Recipes/Lathes/security.yml | 10 +++++----- .../Prototypes/Entities/Structures/Machines/lathe.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 379a84b7e6d..ee927ef24e8 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -210,6 +210,11 @@ Silver: 100 Plasma: 500 +- type: latheRecipe + parent: ClothingShoesBootsMagSci + id: ClothingShoesBootsSecurityMagboots + result: ClothingShoesBootsSecurityMagboots + - type: latheRecipe parent: BaseWeaponRecipe id: AdvancedTruncheon @@ -218,8 +223,3 @@ materials: Steel: 1000 Plastic: 800 - -- type: latheRecipe - parent: ClothingShoesBootsMagSci - id: ClothingShoesBootsSecurityMagboots - result: ClothingShoesBootsSecurityMagboots diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 006d72db5c9..30967c955fd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -938,8 +938,8 @@ - MagazineBoxSpecialMindbreaker - ClothingOuterHardsuitJuggernautReverseEngineered - ClothingOuterHardsuitSyndieReverseEngineered - - AdvancedTruncheon - ClothingShoesBootsSecurityMagboots + - AdvancedTruncheon # End DeltaV additions - type: MaterialStorage whitelist: From e1ff16afeabca76a5a4cfcb043e4d9552d449f9d Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 17:31:51 -0600 Subject: [PATCH 32/38] hyphens --- Resources/Prototypes/Research/arsenal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 7b7b9d279d1..34e475b9047 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -21,7 +21,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi state: incendiarydisplay discipline: Arsenal - tier: 2 #Delta-V moved to t2 from t1 + tier: 2 #DeltaV moved to t2 from t1 cost: 10000 recipeUnlocks: - BoxShotgunIncendiary @@ -82,7 +82,7 @@ sprite: Objects/Materials/Sheets/other.rsi state: uranium discipline: Arsenal - tier: 2 #Delta-V moved to t2 from t1 + tier: 2 #DeltaV moved to t2 from t1 cost: 7500 recipeUnlocks: - MagazineRifleUranium From 9ec120016d7dcf840432ffdb9d9b0ed7bd926137 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 18:41:22 -0600 Subject: [PATCH 33/38] Update Resources/Prototypes/Research/arsenal.yml Co-authored-by: Milon Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 34e475b9047..9b52cd056a1 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -21,7 +21,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi state: incendiarydisplay discipline: Arsenal - tier: 2 #DeltaV moved to t2 from t1 + tier: 2 # DeltaV moved to t2 from t1 cost: 10000 recipeUnlocks: - BoxShotgunIncendiary From 51a27ef7dd456f1e152924d24aa232b1bbaf6ec0 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 18:42:01 -0600 Subject: [PATCH 34/38] space Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 9b52cd056a1..ad561a3bcfb 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -82,7 +82,7 @@ sprite: Objects/Materials/Sheets/other.rsi state: uranium discipline: Arsenal - tier: 2 #DeltaV moved to t2 from t1 + tier: 2#DeltaV moved to t2 from t1 cost: 7500 recipeUnlocks: - MagazineRifleUranium From 4e89f36a54d295526c38d9a5e6a7a0ff0e2d8048 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 18:42:47 -0600 Subject: [PATCH 35/38] line Signed-off-by: Stop-Signs --- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 1c0913676fd..02b2ef0f5ca 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -222,4 +222,5 @@ completetime: 5 materials: Steel: 1000 - Plastic: 800 \ No newline at end of file + Plastic: 800 + From 17a2f23630f5004f3c934fa78b95b78665078a81 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 18:55:34 -0600 Subject: [PATCH 36/38] milon pranked me Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index ad561a3bcfb..9b52cd056a1 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -82,7 +82,7 @@ sprite: Objects/Materials/Sheets/other.rsi state: uranium discipline: Arsenal - tier: 2#DeltaV moved to t2 from t1 + tier: 2 #DeltaV moved to t2 from t1 cost: 7500 recipeUnlocks: - MagazineRifleUranium From 9e9def4b374ae89ccfe42421949f98f481556632 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 19:22:43 -0600 Subject: [PATCH 37/38] Update arsenal.yml Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 9b52cd056a1..1cd05a9c80e 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -82,7 +82,7 @@ sprite: Objects/Materials/Sheets/other.rsi state: uranium discipline: Arsenal - tier: 2 #DeltaV moved to t2 from t1 + tier: 2 # DeltaV moved to t2 from t1 cost: 7500 recipeUnlocks: - MagazineRifleUranium From 83b2cf2435a6ef9b97650d66cf071fa5e15dc554 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 6 Nov 2024 19:23:30 -0600 Subject: [PATCH 38/38] Update arsenal.yml Signed-off-by: Stop-Signs --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 4f2b0c99677..d604eb80568 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -32,7 +32,7 @@ id: EnergyGunsAdvanced name: research-technology-energy-gun-advance icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi state: icon discipline: Arsenal tier: 2