From b395a2e8e60cde46149ff00f50b48b0acb415999 Mon Sep 17 00:00:00 2001
From: Beck <beck314159@hotmail.com>
Date: Sun, 15 Sep 2024 21:57:57 -0700
Subject: [PATCH 1/4] First commit

---
 .../Spawners/Random/Salvage/tables_loot.yml   |  18 +++
 .../Entities/Objects/Materials/scrap.yml      | 147 ++++++++++++++++++
 .../Scrap/generator.rsi/generator_frame.png   | Bin 0 -> 378 bytes
 .../Materials/Scrap/generator.rsi/meta.json   |  57 +++++++
 .../Materials/Scrap/generator.rsi/nothing.png | Bin 0 -> 102 bytes
 .../generator.rsi/old_generator_plasma.png    | Bin 0 -> 876 bytes
 .../old_generator_plasma_fuel_leak.png        | Bin 0 -> 471 bytes
 .../Scrap/generator.rsi/rad_dripping.png      | Bin 0 -> 433 bytes
 .../Scrap/generator.rsi/rad_outline.png       | Bin 0 -> 323 bytes
 .../Materials/Scrap/generator.rsi/red_x.png   | Bin 0 -> 171 bytes
 .../Scrap/generator.rsi/uranium_generator.png | Bin 0 -> 729 bytes
 .../uranium_generator_fuel_tank.png           | Bin 0 -> 318 bytes
 12 files changed, 222 insertions(+)
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/generator_frame.png
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/nothing.png
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/old_generator_plasma.png
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/old_generator_plasma_fuel_leak.png
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/rad_dripping.png
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/rad_outline.png
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/red_x.png
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/uranium_generator.png
 create mode 100644 Resources/Textures/Objects/Materials/Scrap/generator.rsi/uranium_generator_fuel_tank.png

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
index 552b8aae0da321..4f1aa4a4b58057 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -49,6 +49,8 @@
     - id: SheetSteel10
     - id: SheetGlass10
     - id: SheetPlastic10
+    - id: ScrapGeneratorFuelTank
+      weight: 0.5
     - id: PartRodMetal10
       weight: 0.33
     - id: MaterialWoodPlank10
@@ -64,6 +66,9 @@
   id: SalvageScrapLarge
   table: !type:GroupSelector
     children:
+    - !type:NestedSelector
+      tableId: RandomGeneratorTable
+      weight: 2
     - id: ScrapAirlock1
     - id: ScrapCloset
     - id: ScrapFirelock1
@@ -251,3 +256,16 @@
       children:
       - id: JetpackBlueFilled
       - id: JetpackBlackFilled
+
+- type: entityTable
+  id: RandomGeneratorTable
+  table: !type:GroupSelector
+    children:
+    - id: ScrapGeneratorPlasmaLeaking
+    - id: ScrapGeneratorUraniumLeaking
+    - id: ScrapGeneratorPlasma
+      weight: 0.5
+    - id: ScrapGeneratorUranium
+      weight: 0.5
+    - id: ScrapGeneratorFrame
+      weight: 0.25
diff --git a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
index 6530e3b17013d7..65c88e6b2ecfd2 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
@@ -26,6 +26,46 @@
     tags:
     - Recyclable
 
+- type: entity
+  parent: BaseStructure
+  id: BaseScrapLarge
+  abstract: true
+  name: scrap
+  description: Worthless junk. You could probably get some materials out of it though.
+  suffix: Scrap
+  components:
+  - type: InteractionOutline
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: FlimsyMetallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Recyclable
+  - type: Transform
+    anchored: False
+    noRot: true
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.40,-0.40,0.40,0.40"
+        density: 200
+        mask:
+          - MachineMask
+        layer:
+          - MachineLayer
+
 - type: entity
   parent: BaseScrap
   id: ScrapSteel
@@ -404,5 +444,112 @@
       Glass: 500 # 5 sheets
       Plastic: 100 # 1 sheet
 
+- type: entity
+  parent: BaseScrapLarge
+  id: ScrapGeneratorPlasmaLeaking
+  name: leaking P.A.C.M.A.N. generator
+  description: An old looking P.A.C.M.A.N. generator whos plasma tanks started leaking.
+  components:
+  - type: Sprite
+    sprite: Objects/Materials/Scrap/generator.rsi
+    snapCardinals: true
+    layers:
+      - state: old_generator_plasma
+      - state: old_generator_plasma_fuel_leak
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 4500 # 45 sheets
+      Plasma: 3000 # 30 sheets
+      Plastic: 500 # 5 sheets
 
+- type: entity
+  parent: BaseScrapLarge
+  id: ScrapGeneratorPlasma
+  name: old P.A.C.M.A.N. generator
+  description: An old looking P.A.C.M.A.N. generator. It's in very poor condition and non functional.
+  components:
+  - type: Sprite
+    sprite: Objects/Materials/Scrap/generator.rsi
+    layers:
+      - state: old_generator_plasma
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 4500 # 45 sheets
+      Plasma: 500 # 5 sheets
+      Plastic: 500 # 5 sheets
 
+- type: entity
+  parent: BaseScrapLarge
+  id: ScrapGeneratorUraniumLeaking
+  name: leaking S.U.P.E.R.P.A.C.M.A.N. generator
+  description: A S.U.P.E.R.P.A.C.M.A.N. generator that appears to have had some kind of catastrophic failure. Its leaking uranium.
+  components:
+  - type: Sprite
+    sprite: Objects/Materials/Scrap/generator.rsi
+    layers:
+      - state: uranium_generator
+      - map: [ "extra" ]
+      - state: rad_dripping
+      - state: rad_outline
+  - type: RandomSprite
+    available:
+    - extra:
+        red_x: ""
+        nothing: ""
+  - type: MultiHandedItem
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 4500 # 45 sheets
+      Uranium: 3000 # 30 sheets
+      Plastic: 500 # 5 sheets
+
+- type: entity
+  parent: BaseScrapLarge
+  id: ScrapGeneratorUranium
+  name: destroyed S.U.P.E.R.P.A.C.M.A.N. generator
+  description: A S.U.P.E.R.P.A.C.M.A.N. generator that appears to have had some kind of catastrophic failure.
+  components:
+  - type: Sprite
+    sprite: Objects/Materials/Scrap/generator.rsi
+    layers:
+      - state: uranium_generator
+      - map: [ "extra" ]
+  - type: RandomSprite
+    available:
+    - extra:
+        red_x: ""
+        nothing: ""
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 4500 # 45 sheets
+      Uranium: 500 # 5 sheets
+      Plastic: 500 # 5 sheets
+
+- type: entity
+  parent: BaseScrapLarge
+  id: ScrapGeneratorFrame
+  name: generator frame
+  description: A frame of a P.A.C.M.A.N. or S.U.P.E.R.P.A.C.M.A.N. type generator. Where is the rest of it?
+  components:
+  - type: Sprite
+    sprite: Objects/Materials/Scrap/generator.rsi
+    layers:
+      - state: generator_frame
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 1500 # 15 sheetss
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapGeneratorFuelTank
+  name: fuel tank
+  description: A fuel tank from a S.U.P.E.R.P.A.C.M.A.N. type generator. The gauge indicates its got a little fuel left.
+  components:
+  - type: Sprite
+    sprite: Objects/Materials/Scrap/generator.rsi
+    layers:
+      - state: uranium_generator_fuel_tank
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 200 # 2 sheets
+      Uranium: 300 # 3 sheets
diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/generator_frame.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/generator_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..c846c78fb507946c8c50c6806f2c9049253b299f
GIT binary patch
literal 378
zcmV-=0fqjFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003$Nkl<ZSV!%Z
zziWd)6vv-)D0E5<h71NIxMpg%X3DC6sIHxot)04x2+0sC+DwJwZ22C%<FH<q+~J_N
zsHfcb^S<wg4h_7Vf%Rzu5Dr99)N(4)G_~T2PD293aZE{)kWB#AK(MSc2tXKylx3NK
z7#{%a&+~l54xrG-T?24HojIZlw$HEae)mFehj;q?I9eG*s>aHFq)YuHv?hSbfpIy&
z)vxUW{GreuwpT9zHZdZ30ft8=U+)1!U|I+GU<`}$oYQRfAhnw2mpp&dt9`A%<o?`U
z%6r{DfAG%%ezEq07J}Ucpwqc9G9eKppD!n27a#}%$xsx9aKt2l)&civ(L%f|D+%Cv
z3j##_UD<a)1wbkgxeb7u4nS0`1AaE`0RMHRt%x4Js~y03U?5WvYLOes>pk;f0{8>}
Ykcu$xCM75U0000<MNUMnLSTXb0Cc;fZvX%Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/meta.json b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/meta.json
new file mode 100644
index 00000000000000..79f35b3cb27325
--- /dev/null
+++ b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/meta.json
@@ -0,0 +1,57 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Beck Thompson using assets from https://github.com/Baystation12/Baystation12/blob/caa635edb97c58301ccdc64757eba323b6673cf3/icons/obj/structures/portgen.dmi",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "old_generator_plasma"
+      },
+      {
+        "name": "old_generator_plasma_fuel_leak"
+      },
+      {
+        "name": "generator_frame"
+      },
+      {
+        "name": "uranium_generator"
+      },
+      {
+        "name": "uranium_generator_fuel_tank"
+      },
+      {
+        "name": "red_x"
+      },
+      {
+        "name": "nothing"
+      },
+      {
+        "name": "rad_outline",
+        "delays": [
+            [
+            0.3,
+            0.3,
+            0.3,
+            0.3
+            ]
+        ]
+      },
+      {
+        "name": "rad_dripping",
+        "delays": [
+            [
+            2.0,
+            0.05,
+            0.05,
+            0.05,
+            0.05,
+            0.05,
+            0.05
+            ]
+        ]
+      }
+    ]
+  }
diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/nothing.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/nothing.png
new file mode 100644
index 0000000000000000000000000000000000000000..54c77a6a0e9e7b81d4eaf1cf97c1c48970e50f3a
GIT binary patch
literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzT~8OskO=p;7aRqFJVwV~)5Q*_
si&|_xTWS0KF#{tL3x|M$Lj#myAZ5>>_~KpQU!YP3Pgg&ebxsLQ0CQUy@&Et;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/old_generator_plasma.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/old_generator_plasma.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a40e6d2c0480017beb8543e99feba2d3aff3754
GIT binary patch
literal 876
zcmV-y1C#uTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009sNkl<ZSV!%a
zO-NKx6vzKIR_f&VkytS`qUGd_ViPf9LFi;ft76>GqG*$=+64wd;KF4@1#Kb*q&B*Z
z)TE7BR2b=K+BBqzqlT8ILSU~s*Usb3oA<_d)o|0@-1l+r{r}F_eJ=xBJTkUeAO8VF
z1cJe!!l~%!==dj5G1E{18XFtY-rkOr@hP<|GM!FzF0b-LhWb;=CHi?J3HD%_TXlqt
zy&j*sw)#jVSc4w2qbUG&S=sQ|2F1d`s2z8wzQO6-r;6t~c41-ur?{V(m=q!mm(ETL
z;PrYDi9`fM3P8Y?iNjeVfU62aF$H&Cy%7LfF*8xJ(GOlL2jJcTj16GM7s8XC*Z46%
zB>;G{3QxHjg*?X|!w3)vz2mj=0ErDgj{L&ycke-h!$YHn0D6!0DUyzWS_6p`FaU3&
zowY&)p}ps8iW<YqN8oP?Zr*#4R0Hg>QCH}rLA4^C0&2sHHxfmd7~zKjkpl9(xVRvt
zz^pu&o}Lr+qi;iQMbQPvjt7);r%vGM^Io_Y=is;JV0&2^dOr-HYjOgP+*I)c`%5tX
z^$Td`LH9;ueqj!-Lsei6*WP@L#lPe2%bwLXGy^C&>ch3xRso>RzZK8fhP;;o@RuZ7
zCo(M7pAOXFdRrSR6S*AJoP@FQ^Kjo96*f7;D_E+qiJ1mncRpJZ*B4wnq4dwl0W{TA
zW8qU2zh`HWSK~JXcvSDi<#LA*A+a-ObCLkGVA+r3*j<#56`S2!3J9R9=S5Nk%u;ZF
zc@bB#?P)V2odPbxZH0v>3e>ALkWPgQl5DsrwFN0%1GEv<0oMSFmzI_$al~RVQ!cXA
zzNaqW>No8I`a)5ASRJ;NMb(sYY;_m{&_nu6@*o)gZ1QYXz{rjqGmU_LL2YfV(%09g
z{%p`Wu@Q0o+LQ>a1wilVmx{c&+H?t_P)Pc>EgTLj^v9)5v3e590MK#T($XRg(A?at
zaE+}Q0W#K$a0E63fE_lB0Eu^ZccY=9A<0v&gUtX~R|JTfKUy120qsTJ(=3%s0?@as
z)$ZW@voNod0^lfE71i76#ib*#Ug31>q$9A|5PtyW=9fQFmKtjS0000<MNUMnLSTYB
C(VJ%g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/old_generator_plasma_fuel_leak.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/old_generator_plasma_fuel_leak.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d8b28b3465684e6c5fac8ff4e196bd44b425551
GIT binary patch
literal 471
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFwXOIaSVxYPfn3YIAC$$n{kg-
zf(eV8GbYiN#=*kI_V4_O6A3$RT{y8|?VqU+U&ZFJy=|+iVE%n?Z#9pXdwRps=|&rj
zPk3?|tcl+*w>teK7vluxU%!4yTyu9dR=IX3X~z9U#{_odXdaeX%h$#c=Fc{_EV_-K
z>s3PGEXxCD&-OmN@MR{?vO6(6%lFqMZ#eCfe&UDtu>%)=w=H~DDc`)|VCse+|EB9p
z>a5jSA<tyMzQx-obw$m@vkOXY&r!T;)|dG0q3eTyjNl9gcTQiKgq)W@<VDuMj(KJf
zv(ko#uV}*g^?P=n+wkanS=+REW*eS5RtFvUvRGVR;+))l|Gg#*-nm!jy!;=n(k=0=
zV19$TLudOR0e6O@j(kj(eTLBz=~2qsf=xNU*Oz?$UpLpAr|+HLhl=vD(!_#2i;fq3
zK5pA~^u4)3!;k9n_lX&Q?Iv6C-B`Q(gZ+u3={)jnw#M5GR(P#ysQvfzNH&|Spf6in
zl3>A<J!L=6DwMXdzu^cdvAI*hyoPUzodd&7$CP%4tyNbUoJ!^?{_;C^2N+=tp00i_
I>zopr0EObu-~a#s

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/rad_dripping.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/rad_dripping.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b8f9eb2cd30557d371021ed14f0a070f063a22f
GIT binary patch
literal 433
zcmeAS@N?(olHy`uVBq!ia0vp^4}e&KgAGV>A1w)GU|_89ba4!+h<kf|p`TMC1M7qN
zN77Q+;u;)`0y8qoK6`SA#UDE0yyGXE$dZetCDw~4D#WrorYALgF1YEgxZ(89?~muy
zFAm(pA<)5Tl610(Q$T}l1q(|P6Pv^lao+<Br40@N2N;@vEaH?{z$d`LC6OQyZ^FoY
zg^|gTk(uXFw^~Ajm4kvtLW5(?MHZd_b`BO+9)k}3Sq+S@7#bHeFtUAg6*h2?RS*y{
zIH0gEgNbbgGd9Do)HVF|+#glD=G31;xyoq|e{Yzz&o}v}R!n}QN9JqaZ@=GdXFu>J
zPpr6v;mU5`jgPL(ep~bI9%F&s{-cKFNe#zW?0gn|fUzJ-lIMeoeRw<Tt2zc5+XLr<
zmuKDGe(F(b;4S{QpYH!}e)4&L%RgD01MiBrN7b(@UmWc>ZE59Qo!L**zT54Po$~SZ
zj-14*@V!R6BxV2n{mmEh^N;?@`g*$wwalL^8JX;XuIGih{sFheyxWQf&gYH;qk_TH
L)z4*}Q$iB}^3SiU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/rad_outline.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/rad_outline.png
new file mode 100644
index 0000000000000000000000000000000000000000..09a4c0826ac078b4e2167d80aa3125ce2d2c2193
GIT binary patch
literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfej?x;TbZ#J!#B&2`9tfmM3X
z1U=gh@xr(4_SyQ69AjR!E}7)IfJHMmQ}bod>mwHLdCv#@bW|6(@a0fA7sGT1MiGX2
z3^Mmw0~jip3Tnh17$0yR_!!H;+Mv#GyqpZlhDN44_m{_hewA2U%lBth<a$x<12L>i
z%3p7|Wj34p>-VYVmP<vFKZ>h6Fr7bqmbo*vC)S}xS+qW8{`a$o^5>sc7FX~xJevRG
zxY?Bb8jMOQ^BsQA%fJ07q%N-J_FRplGlaf8eOa_mgE8&z=9m|cxi(x#+MT57aD9nb
b)jRh4GCqp6iKm|d1Bb!W)z4*}Q$iB}kz0I&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/red_x.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/red_x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ec4fd6268312a59c469a49a6116a06c555d3cc1
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ0#6smkO=p;lN`Ai6nU86mjC%5
z{in~H)p6S0ApV8ZKR!`Zc`1;6^nBN6X;y^^N(R;Q&D^}ItzY>E^Oq>|+y3AFOtQ9O
zs#T4w<kmYcrn=T~?{N;b=HOn@Rvt86$J%(`+Jy`(3Ji=K4h&2J4Gxx#?9)!GD7I=m
Ts|VW6;OXk;vd$@?iGcwC?MXM^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/uranium_generator.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/uranium_generator.png
new file mode 100644
index 0000000000000000000000000000000000000000..76b11fa509e58861b4784298a9a1705f3ee8b131
GIT binary patch
literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007>Nkl<ZSV!%a
z&2JJx7{=e?S4czKRE6Duq@hR*@uoIW6QezGGjJwqJbLmkz{+3XsYj!RGsGJw^`uGF
zD>0-c1WQ;@n-*+PV_AKsdDmq>fGvx?bS}fr%<l7>=Y8K9rs$B{)FJEB5rA+YnM|r2
zibA0<5m)RqG=NkpMfrT5YRYzBTKs6YXtVL9Z)|6)H579GjHE^uLbUVqxOn$sR3_HI
zGjG%qAhCQ+yi|PkmfGLDG<)hdRjQk`^;H=vjQ3{e{ld}nkuc2!qV%~|?E{F%<5Vh@
z1jI-HCwrZdTwq~{hvc*L%j2VS;f3)5@R4?Nox0twaHi4xHqZ^&k97!vD-Q537zE)!
zvkM6T<iKfn9Y7ozWKd4%caH>gEd&7I#yN4!<1rnid%d1WKF<CF0X%$gUwrt<>Qhk#
z*KaJFgx<e-**E6(dbJ$6a`Uz}SF2V`Nyw906<oS{OGW9S?3CI%EiGLZYu462(B6p|
z^7(uw04D>TPKScBpI9R-&585o<Ga`UWjG3eJ`tUWBXo`d^aAX_wz8oO=W;npr_+S~
z?wxz|{KYdW7K@ZfBt);DpOY4y14!Yh5JNbu0J7OEWilB;|9B-!k5)2NE|)15i-{fp
zyyidvRu25v5Lh|jB<{wwW9Ps);`}bEfV1DW3UEUiuVXjFjo+{Yz#y(kZh+xyllyUC
zurXT)_`^64>XlD4J^k<C+1>qnh(s<}YPXdAO9{;{g|y#x<GjG+08cDNVk!iU4L}=}
z@<@M1hPi}I@*3?VGy<TWxuLGz2C#KN3dkzN>-B~P5Dd!Va8a6#$vdD2Kq#>DNdOFV
z0HXRl;AgiTK>T5|W-E4&0euB<92m$g2z{cu64zmwKWP34;1541bU%Q;(HsB(002ov
LPDHLkV1fVuU+q(&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/uranium_generator_fuel_tank.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/uranium_generator_fuel_tank.png
new file mode 100644
index 0000000000000000000000000000000000000000..59cf3663bf307063f8486dd99b60f9c320ec2eb9
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFfx0(IEF;HC#Ogx9I!a>&A7)Z
z!Gy)l8A4>VHWb%Au8+98u{_E4&c_``I#;H5@HPIs8vWn?_Li9kmngPA^f@fUrfDC)
z<7a-{{-g`V*IT>A+p2_f^)7O~zrX)~eN?P^^W7yCZO)b4lAC6oddN3p^IwK$*ClK*
zF@b>-Gm1OIENXv!`TzUd{Im~QClYU5GiY@@dvKa#+eh{rg6Z)!NgMdeS-Z<iuNhr9
z!g%%av;X@`9~d+{$BG?pT$WkDZu9f}!4IFFYO@^<NZ(PB9j0_qPB}{P#B$fmY6pcA
z<HO`)^z{l?sW~O_D7*7|DmwJBwtPYH;sIv{29e_-ic1yd7yv_s!PC{xWt~$(69WSP
Dpq_(@

literal 0
HcmV?d00001


From eec67843c0964b040bb74cea572ca8cf3feb7035 Mon Sep 17 00:00:00 2001
From: Beck <beck314159@hotmail.com>
Date: Sun, 15 Sep 2024 22:20:42 -0700
Subject: [PATCH 2/4] Forgot the shading!

---
 Resources/Prototypes/Entities/Objects/Materials/scrap.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
index 65c88e6b2ecfd2..755aeaf4eacbb5 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
@@ -490,7 +490,9 @@
       - state: uranium_generator
       - map: [ "extra" ]
       - state: rad_dripping
+        shader: unshaded
       - state: rad_outline
+        shader: unshaded
   - type: RandomSprite
     available:
     - extra:

From c95dea483359e42122dce23f08dd61c2acd5d103 Mon Sep 17 00:00:00 2001
From: Beck <beck314159@hotmail.com>
Date: Fri, 20 Sep 2024 23:02:45 -0700
Subject: [PATCH 3/4] tweaked  values

---
 .../Entities/Objects/Materials/scrap.yml      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
index 755aeaf4eacbb5..c63f0bdd37d157 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
@@ -458,8 +458,8 @@
       - state: old_generator_plasma_fuel_leak
   - type: PhysicalComposition
     materialComposition:
-      Steel: 4500 # 45 sheets
-      Plasma: 3000 # 30 sheets
+      Steel: 4000 # 40 sheets
+      Plasma: 2500 # 25 sheets
       Plastic: 500 # 5 sheets
 
 - type: entity
@@ -474,8 +474,8 @@
       - state: old_generator_plasma
   - type: PhysicalComposition
     materialComposition:
-      Steel: 4500 # 45 sheets
-      Plasma: 500 # 5 sheets
+      Steel: 4000 # 40 sheets
+      Plasma: 1000 # 10 sheets
       Plastic: 500 # 5 sheets
 
 - type: entity
@@ -501,8 +501,8 @@
   - type: MultiHandedItem
   - type: PhysicalComposition
     materialComposition:
-      Steel: 4500 # 45 sheets
-      Uranium: 3000 # 30 sheets
+      Steel: 4000 # 40 sheets
+      Uranium: 2500 # 25 sheets
       Plastic: 500 # 5 sheets
 
 - type: entity
@@ -523,8 +523,8 @@
         nothing: ""
   - type: PhysicalComposition
     materialComposition:
-      Steel: 4500 # 45 sheets
-      Uranium: 500 # 5 sheets
+      Steel: 4000 # 40 sheets
+      Uranium: 1000 # 10 sheets
       Plastic: 500 # 5 sheets
 
 - type: entity
@@ -539,7 +539,7 @@
       - state: generator_frame
   - type: PhysicalComposition
     materialComposition:
-      Steel: 1500 # 15 sheetss
+      Steel: 1500 # 15 sheets
 
 - type: entity
   parent: BaseScrap
@@ -554,4 +554,4 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 200 # 2 sheets
-      Uranium: 300 # 3 sheets
+      Uranium: 500 # 5 sheets

From 9cc28612eb2796adaec109ceba20fabbb8b9f71d Mon Sep 17 00:00:00 2001
From: Beck <beck314159@hotmail.com>
Date: Mon, 23 Sep 2024 22:50:37 -0700
Subject: [PATCH 4/4] sprite update

---
 .../Scrap/generator.rsi/generator_frame.png     | Bin 378 -> 393 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/Objects/Materials/Scrap/generator.rsi/generator_frame.png b/Resources/Textures/Objects/Materials/Scrap/generator.rsi/generator_frame.png
index c846c78fb507946c8c50c6806f2c9049253b299f..0914769086d51f18b04057d4c1c9a2cd80cd58f6 100644
GIT binary patch
delta 366
zcmV-!0g?Xt0*M2VB!5szL_t(oN9~rsOT$1E$6x0nIB816p+b<XPIc4CHTgr6)k!xy
zxrPw1LoqZu3DP<8jeL)z_FQ_81e&*8atZf7@B4lv6Y1F|J^Pmtpi>}8l9s8+^ISz0
zmk$Gwrm19ECYk{Bfne#U7l1g9r6`IH;`jg{e_57CtN;pq*nc&kIhyS@WGi-EaI?5;
zAMS7E@##gdY8cPPdKsL`y7`jV<@0YF4hjHt8it6e@~FVD70~PgM($JqUnmrdw(SML
zCPpL;FdUg&4*^49P6c={=0UwGWjZ}EzP8(M3Fp^)eSbFZX8$a>FxReqzVJr@KDe4k
zEgbF|fZkS>muFu!1j+NwB-{mvqR22*Rn;lt6TqoJa6W6{yskF}APi>$h~{IXuYe7J
zR3LH<fPWQ$Q@aj$?^^-nA2J(R5j{5S4qzS#<O{+saxZy3WIl`lKMDYUFe^-YD*ylh
M07*qoM6N<$f<vyKLI3~&

delta 351
zcmV-l0igbg1Ns7xB!53iL_t(oN9~orYlA=($Dea3bV?0|3<e~)W@@))%Bp{;uAP#t
zow|w$$q*{qOoifX`5wIEuwItj;h?vur`-4RzVC+)4ZNIz^=SeS4n$GZaw^g^wc?6S
zLjuHcOi7ZEO#s$Fu&gr(Kp2LUWto5&9{}vn^L)e(pwP!%1AlNpojIZlw$HEae)mFe
zhj;q?I9eG*s>aHFq)YuHv?hSbfpIy&)vxUW{GreuwpT9zHZdZ30ft8=U+)1!U|I+G
zU<`}$oYQRfAhnw2mpp&dt9`A%<o?`U%6r{DfAG%%ezEq07J}Ucpwqc9G9eKppD!n2
z7a#}%$xsx9a9G47fYt%`Y0*NwEGr4%c?$wW{ax92Km|Z55V;M2n+`x!tpk2G?EwFE
xrLBk_zN;O;d0-$@5NeSd$?HAyVFLIA|B#9>?<OTE00000NkvXXu0mjf005@Tp?UxS