From 69da968acb473a89a1979e23f6da878e98593c1e Mon Sep 17 00:00:00 2001 From: Etrnlmelancholy Date: Fri, 29 Nov 2024 01:31:12 +0300 Subject: [PATCH] fatty is no longer in game, now everything is oreshnik --- code/game/objects/effects/overlays.dm | 4 ++-- code/game/objects/structures/dropship_ammo.dm | 10 +++++----- icons/Marine/mainship_props64.dmi | Bin 55585 -> 55587 bytes icons/effects/lases.dmi | Bin 10432 -> 10432 bytes 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 88f8bb5052d..ec0f6fa4f00 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -335,8 +335,8 @@ /obj/effect/overlay/blinking_laser/keeper icon_state = "keeper_target" -/obj/effect/overlay/blinking_laser/fatty - icon_state = "fatty_target" +/obj/effect/overlay/blinking_laser/oreshnik + icon_state = "oreshnik_target" /obj/effect/overlay/blinking_laser/napalm icon_state = "napalm_target" diff --git a/code/game/objects/structures/dropship_ammo.dm b/code/game/objects/structures/dropship_ammo.dm index 630f8828cc9..99b1157a9ac 100644 --- a/code/game/objects/structures/dropship_ammo.dm +++ b/code/game/objects/structures/dropship_ammo.dm @@ -421,19 +421,19 @@ cell_explosion(impact, explosion_power, explosion_falloff) //tighter blast radius, but more devastating near center qdel(src) -/obj/structure/ship_ammo/cas/rocket/fatty +/obj/structure/ship_ammo/cas/rocket/oreshnik name = "\improper RS-26 'Oreshnik'" desc = "The RS-26 'Oreshnik' is the most devestating prototype rocket in TGMC arsenal, only second after its big cluster brother in Orbital Cannon. These rocket are also known for highest number of Friendly-on-Friendly incidents due to secondary cluster explosions as well as range of these explosions, TGMC recommends pilots to encourage usage of signal flares or laser for 'Oreshnik' support. Moving this will require some sort of lifter." - icon_state = "fatty" + icon_state = "oreshnik" travelling_time = 5 SECONDS ammo_id = "f" point_cost = 350 explosion_power = 450 explosion_falloff = 120 prediction_type = CAS_AMMO_EXPLOSIVE - cas_effect = /obj/effect/overlay/blinking_laser/fatty + cas_effect = /obj/effect/overlay/blinking_laser/oreshnik -/obj/structure/ship_ammo/cas/rocket/fatty/detonate_on(turf/impact, attackdir = NORTH) +/obj/structure/ship_ammo/cas/rocket/oreshnik/detonate_on(turf/impact, attackdir = NORTH) impact.ceiling_debris_check(2) cell_explosion(impact, explosion_power, explosion_falloff) //first explosion is small to trick xenos into thinking its a minirocket. addtimer(CALLBACK(src, PROC_REF(delayed_detonation), impact), 3 SECONDS) @@ -445,7 +445,7 @@ * * (turf/impact): targets impacted turf from first explosion */ -/obj/structure/ship_ammo/cas/rocket/fatty/proc/delayed_detonation(turf/impact) +/obj/structure/ship_ammo/cas/rocket/oreshnik/proc/delayed_detonation(turf/impact) var/list/impact_coords = list(list(-3, 3), list(0, 4), list(3,3), list(-4, 0), list(4, 0), list(-3, -3), list(0, -4), list(3, -3)) for(var/i = 1 to 8) var/list/coords = impact_coords[i] diff --git a/icons/Marine/mainship_props64.dmi b/icons/Marine/mainship_props64.dmi index cd2f2e4e9381444811f1bd7356dc55c4dfc8e972..b7f4662d191b7fe61ac7640be945c463e0925c60 100644 GIT binary patch delta 442 zcmV;r0Y(0yvIC>C1CS(tpn6nTbVOxyV{&P5bZKvH004NLos=<8!!Qtq=j2ydu%arZ z1*R;h2z3B;VYaUEwK>H;N487pzh@{?0~9XqmPp@wd8fR)YxVf_ynI!Qmu2~mA(CfR ztNElVi#?gts#@L8%c4cvw(0m16C_l%x|&ta=?0iRUzLTS5LK;zre(1S;PCi-j@865 zfwgE(s=2JP9t@i41)56K1mAR+bnlHg$O+AuBNA^dir#xNe(#{ekQ3uLq?ln199xt_ z{BmB4)*WJhN#;&;_5owd)a83`L~n*3tjl+1(b*AGMy0;v8MXQ$99aYl5rbYM$g`i& zj8p^B$V6Y;ngSeu#7F~H<413Oq<6X0Lltp@YzRW$#~QnfX++D1n%+WmkR_RB(YIOj zEQ_9J(RW$&y-06%X!RQ6h=1$7CEn_IhzaFRf5*@D`oBcTEpUV3Qk_W0mU`{b`9NSr z+CbUs!Y~lU=j2mZWko0y zXs0X{RmA{eVYZI=AgB0GWE&{oz5|sAE$zi@vGjW{@8owLh`0BT#Y)VVi~NW_kh7u` z(@~LUCsMH%rFfafXniR&!3aoYZDbE!7AWAWR&a<5dgO~4ntRx#E zXpQQsn(`{`K%p8xpeb05cU6N?wob8wT+xI%0@=Mr*84=toeVVSQ(|0(WHW5Rh8p=0 zznr(Mb%WSGlDT1>cM#(_-FU|uTWCR>bZ5&t8?uzpr&~OsQ$K_~Tc9DJmszpRLm*E^D@}0iL@Adk>L}+WU75YbYEFEfUr9tC7fo5q1 zzA+I0?ByiS6lyq&QWT@tVKJHwyUEC7tD!=6Ll1U;AcaaQUY;8^*AG7NUAw35`IKzd iYkq?^>-C?DGZ62qxtK2(`4{Ts#BpzTq~x>B0an)sh1XpG diff --git a/icons/effects/lases.dmi b/icons/effects/lases.dmi index 96ef8dd7f8971ef8834ced8357894177d45a034c..b23439d353dbb9beb99007d33f2b12ba2a949d3a 100644 GIT binary patch delta 267 zcmV+m0rdXBQNU4!FbFS6Z6ynTmM zYOByxgl_h5KYjLRui~;*g4h@Lk@d1(;L2*vFtebi>5S7&6UOOLQXM;>tZ5Wujeb8n@;Fj zLyh;#&(IhQ%LBCdw)m-AR?5)rIl1|@!Jo+Z<;Dox`}6l+)dnMl+oONQSi}BQLV2vj R2QpVH66gY8^s_esi6_20gbx4! delta 267 zcmV+m0rdXBQNU4