diff --git a/code/modules/projectiles/ammunition/ballistic/rocket.dm b/code/modules/projectiles/ammunition/ballistic/rocket.dm index bb5c1072c14..cf88fd02313 100644 --- a/code/modules/projectiles/ammunition/ballistic/rocket.dm +++ b/code/modules/projectiles/ammunition/ballistic/rocket.dm @@ -1,5 +1,5 @@ /obj/item/ammo_casing/rocket - name = "\improper PM-9HE" + name = "\improper Dardo HE rocket" desc = "An 84mm High Explosive rocket. Fire at people and pray." caliber = CALIBER_84MM icon_state = "srm-8" @@ -15,15 +15,17 @@ icon_state = "[base_icon_state]" /obj/item/ammo_casing/rocket/heap - name = "\improper PM-9HEAP" + name = "\improper Dardo HE-AP rocket" desc = "An 84mm High Explosive All Purpose rocket. For when you just need something to not exist anymore." icon_state = "84mm-heap" base_icon_state = "84mm-heap" projectile_type = /obj/projectile/bullet/rocket/heap /obj/item/ammo_casing/rocket/weak - name = "\improper PM-9HE Low-Yield" + name = "\improper Dardo HE Low-Yield rocket" desc = "An 84mm High Explosive rocket. This one isn't quite as devastating." + icon_state = "low_yield_rocket" + base_icon_state = "low_yield_rocket" projectile_type = /obj/projectile/bullet/rocket/weak /obj/item/ammo_casing/a75 diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 1985046a434..860bfd81f0b 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -42,13 +42,19 @@ casing_ejector = FALSE /obj/item/gun/ballistic/rocketlauncher - name = "\improper PML-9" - desc = "A reusable rocket propelled grenade launcher. The words \"NT this way\" and an arrow have been written near the barrel. \ - A sticker near the cheek rest reads, \"ENSURE AREA BEHIND IS CLEAR BEFORE FIRING\"" + name = "\improper Dardo-RE Rocket Launcher" + desc = "A reusable rocket propelled grenade launcher. An arrow pointing toward the front of the launcher \ + alongside the words \"Front Toward Enemy\" are printed on the tube. Someone seems to have crossed out \ + that last word and written \"NT\" over it at some point. A sticker near the back of the launcher warn \ + to \"CHECK BACKBLAST CLEAR BEFORE FIRING\", whatever that means." + icon = 'icons/obj/weapons/guns/wide_guns.dmi' icon_state = "rocketlauncher" inhand_icon_state = "rocketlauncher" + worn_icon_state = "rocketlauncher" + SET_BASE_PIXEL(-8, 0) accepted_magazine_type = /obj/item/ammo_box/magazine/internal/rocketlauncher fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg' + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY can_suppress = FALSE pin = /obj/item/firing_pin/implant/pindicate @@ -70,11 +76,16 @@ AddElement(/datum/element/backblast) /obj/item/gun/ballistic/rocketlauncher/unrestricted + desc = "A reusable rocket propelled grenade launcher. An arrow pointing toward the front of the launcher \ + alongside the words \"Front Toward Enemy\" are printed on the tube. \ + A sticker near the back of the launcher warn to \"CHECK BACKBLAST CLEAR BEFORE FIRING\", whatever that means." pin = /obj/item/firing_pin /obj/item/gun/ballistic/rocketlauncher/nobackblast - name = "flameless PML-11" - desc = "A reusable rocket propelled grenade launcher. This one has been fitted with a special coolant loop to avoid embarassing teamkill 'accidents' from backblast." + name = "\improper Dardo-REF Flameless Rocket Launcher" + desc = "A reusable rocket propelled grenade launcher. An arrow pointing toward the front of the launcher \ + alongside the words \"Front Toward Enemy\" are printed on the tube. \ + This one has been fitted with a special backblast diverter to prevent 'friendly' fire 'accidents' during use." backblast = FALSE /obj/item/gun/ballistic/rocketlauncher/afterattack() @@ -84,6 +95,11 @@ /obj/item/gun/ballistic/rocketlauncher/attack_self_tk(mob/user) return //too difficult to remove the rocket with TK +/obj/item/gun/ballistic/rocketlauncher/update_overlays() + . = ..() + if(get_ammo()) + . += "rocketlauncher_loaded" + /obj/item/gun/ballistic/rocketlauncher/suicide_act(mob/living/user) user.visible_message(span_warning("[user] aims [src] at the ground! It looks like [user.p_theyre()] performing a sick rocket jump!"), \ span_userdanger("You aim [src] at the ground to perform a bisnasty rocket jump...")) diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm index 22082d3809f..dd9f18a114a 100644 --- a/code/modules/projectiles/projectile/special/rocket.dm +++ b/code/modules/projectiles/projectile/special/rocket.dm @@ -72,6 +72,7 @@ among other potential differences. This granularity is helpful for things like t /obj/projectile/bullet/rocket/weak name = "low-yield rocket" desc = "Boom, but less so." + icon_state = "low_yield_rocket" damage = 30 /obj/projectile/bullet/rocket/weak/do_boom(atom/target, blocked=0) @@ -101,6 +102,7 @@ among other potential differences. This granularity is helpful for things like t /obj/projectile/bullet/rocket/pep name = "precise explosive missile" desc = "Human friendly, metal unfriendly." + icon_state = "low_yield_rocket" damage = 30 anti_armour_damage = 80 //Doesn't (probably) kill borgs in one shot, but it will hurt random_crits_enabled = FALSE //yeah, no diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index 21225a3ab98..95a8194cd6a 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -226,7 +226,7 @@ // 'If god had wanted you to live, he would not have created ME!' /datum/uplink_item/weapon_kits/medium_cost/rawketlawnchair - name = "84mm Rocket Propelled Grenade Launcher (Hard)" + name = "Dardo-RE Rocket Propelled Grenade Launcher (Hard)" desc = "A reusable rocket propelled grenade launcher preloaded with a low-yield 84mm HE round. \ Guaranteed to send your target out with a bang or your money back! Comes with a bouquet of additional rockets!" item = /obj/item/storage/toolbox/guncase/rocketlauncher diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index c3e5dc82069..1b597f0d33d 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index eb06288d800..4f7f64db8c6 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 7e8297c848d..4c1acc9fa46 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index 366f285789a..f3a5f34e247 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/weapons/guns/ammo.dmi b/icons/obj/weapons/guns/ammo.dmi index 07a4bde661a..62fb2e45114 100644 Binary files a/icons/obj/weapons/guns/ammo.dmi and b/icons/obj/weapons/guns/ammo.dmi differ diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi index 5cd823cc9c4..f6105e9c5ae 100644 Binary files a/icons/obj/weapons/guns/ballistic.dmi and b/icons/obj/weapons/guns/ballistic.dmi differ diff --git a/icons/obj/weapons/guns/projectiles.dmi b/icons/obj/weapons/guns/projectiles.dmi index 6e6b1797c42..11b9af13a2c 100644 Binary files a/icons/obj/weapons/guns/projectiles.dmi and b/icons/obj/weapons/guns/projectiles.dmi differ diff --git a/icons/obj/weapons/guns/wide_guns.dmi b/icons/obj/weapons/guns/wide_guns.dmi index 1f51a0a91d8..c05453c3c25 100644 Binary files a/icons/obj/weapons/guns/wide_guns.dmi and b/icons/obj/weapons/guns/wide_guns.dmi differ