From 7ef0ecd9965f0cf636d33b92a673b2f65645ac03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:37:58 -0600 Subject: [PATCH] storage sprite --- .../ship_weapons/energy_weapons/phaser.dm | 3 +-- .../energy_weapons/subspacecooling.dm | 2 +- nsv13/icons/obj/subspace.dmi | Bin 1259 -> 1275 bytes 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm index 6740670639f..790c10008ea 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm @@ -37,7 +37,6 @@ var/list/storages = list() var/cooling_amount = 0 var/storage_amount = 0 - heat_rate = 10 var/storage_rate = 100 var/weapon_state = STATE_NOTHING var/ventnumber = 1 @@ -47,7 +46,7 @@ var/charge_rate = 430000 //How quickly do we charge? var/charge_per_shot = 660000 //How much power per shot do we have to use? var/heat_per_shot = 100 //how much heat do we make per shot - var/heat_rate = 0 // how fast do we discharge heat + var/heat_rate = 10 // how fast do we discharge heat var/max_heat = 1000 //how much heat before ::fun:: happens var/overloaded = 0 //have we cooked ourself max_integrity = 1200 //don't blow up before we're ready diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm index 95c13c1cd25..91cc72c56c5 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm @@ -102,6 +102,6 @@ /obj/machinery/cooling/storage name = "subspace heatsink unit" desc = "A cooling unit that stores the massive amounts of heat energy weapons generate in subspace." - icon_state = "cooler" + icon_state = "storage" circuit = /obj/item/circuitboard/machine/cooling/storage diff --git a/nsv13/icons/obj/subspace.dmi b/nsv13/icons/obj/subspace.dmi index 2fad42df9e823574899073c0720ea62bd4f2a600..0d7227e08ae1a3d987e516436dd016d2d25c84ac 100644 GIT binary patch delta 982 zcmV;{11bFL3Hu3PS001Tc z6-5A29{^HP08#(|w9x`P00001bW%=J06^y0W&i*Hijnwte=f-{N=#41Zj2$9vVyCh z3)p!8SxYR%>_#9s0009@Nkl>765I`l%#Vl??b)7)=Jt0ez#>U_{ZPWb! zM^!VjWf|;<6PbtRbROV{JCg84=*$ozgRTUrge9lcSqVMGk^^Rpxmt)}nPSN$79W1n z0&`@FH5X6Ae{$OCcp^HTJcr?fT5>|gn}-l_w~Hy5Q0suV56?g9^o)Rv2Xf7%FAIOp(p&%+Tzz+cTEk-N8qcTR@HqE|-@I+>xY;3;gHFHRw`Rgj;;y7_ntTToD(!ln7@6#9O% z0(sXoD=2u=DO7h+y@K+tsaK%$x>G3cBC76^e!FQlxKCRkUXD z+tfc4iZbW<=d+V#-LBX`Q)H_D4GMKdf4_eJax$mat12?p|0ac+qL)7}wTevjzd>QC z==JqgDC+mCiVXEXG4v0*BHX|k462F@^*=H752jOOs{aWw^$&0T(bnh>h_OE?6zNw* zp{T9?02S$%9V%+IKM;zT795vvvp=8}EE4F4=@0$_tYbdUyf4o<00000NkvXX1g=70 Eg4{jSmjD0& delta 967 zcmV;&133Kq3F`@vBmugSC7?4D6&fEPCN3~L|9=4goIs_iw#&`Y?(XixVE{)(s67CzqQ7CRACw2e-x2lz7dF@D%Up5Tab7rN9 zMjJ6=OoK0hwLs)K-&z7LA@V>+QM8R9ADa>)uW9+>Hw0CqOUS%jO=Q@?AeMg^3`|X= z7E0t9mw#eKDtc!}m8hav4&_wd2n;kI#k;%mm#P@x3D)OZ0#Ow2?ZI!)1ncnFB6tV; z`{o@uELe+|0#FgFJ*t~b?NSUpOhDrq*9{fxni{dDx3@W!XFN%C3Dj6X??vB#BnhYT zj1Pyl1VO4xdN|}%UVhRJpd^1yQ~0!SQ*+B{=P-Bq*{qrEpIL~uGpXZz( z9sBv?BWclSlx3+bff@_>n5J1a8gV`z=ee8D^YNJTlhd|^Ti3~3>gXtR!KqAL{4$~_O)cBj*yZe6!%s<@U-QKA2 z%vdl|8W!@gZNXS+Sjb0Xff@h!GWFkR>xuexvp7SvtX8E?BVN&FV*v&L^h&HK90o<(j8nzP1j z0p?v@sLvv9&ytP>>MVcxi0AKy1H!D>+N2R){z+z)z9zkdD?&QHz% zK>=$1??wtzE~{&%5V6oTo$dD{|$fI@4qEL%>VTYX8&qb zLM)H~HUB%dpc0E|BS6jn4uM%UM*`&huTg=3FalE~K+ga53WVO?vg`;1^MBy}fGrXV zWk(>C{{#1j)*gsTV%efl{$G86XbCv>pjY@^aer`j(G<67zwqn5KLiE(hhNYAp%H)v zg70#