From c97045ba28a60f017ee9b954af29c4e972b64930 Mon Sep 17 00:00:00 2001 From: fernerr <35879136+fernerr@users.noreply.github.com> Date: Wed, 12 Jun 2019 18:43:09 +0200 Subject: [PATCH] Replaces grenade sprites. (#6546) --- .../weapons/grenades/anti_photon_grenade.dm | 4 +- .../items/weapons/grenades/chem_grenade.dm | 5 ++- .../items/weapons/grenades/emgrenade.dm | 2 +- .../objects/items/weapons/grenades/grenade.dm | 1 + .../Ferner-190609-sprites_grenades.yml | 41 ++++++++++++++++++ icons/obj/grenade.dmi | Bin 3575 -> 5604 bytes 6 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/Ferner-190609-sprites_grenades.yml diff --git a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm index 4a051099254..9ed2ddf0f8f 100644 --- a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm +++ b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm @@ -2,8 +2,8 @@ desc = "An experimental device for temporarily removing light in a limited area." name = "photon disruption grenade" icon = 'icons/obj/grenade.dmi' - icon_state = "emp" - item_state = "emp" + icon_state = "photon" + item_state = "photon" det_time = 20 origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index d454d1ce64a..88a409f28b8 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -1,7 +1,7 @@ /obj/item/weapon/grenade/chem_grenade name = "grenade casing" icon_state = "chemg" - item_state = "grenade" + item_state = "chemg" desc = "A hand made chemical grenade." w_class = 2.0 force = 2.0 @@ -185,6 +185,7 @@ name = "large chem grenade" desc = "An oversized grenade that affects a larger area." icon_state = "large_grenade" + item_state = "largechemg" allowed_containers = list(/obj/item/weapon/reagent_containers/glass) origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3) affected_area = 4 @@ -253,7 +254,7 @@ beakers += B1 beakers += B2 - icon_state = "grenade" + icon_state = initial(icon_state) +"_locked" /obj/item/weapon/grenade/chem_grenade/gas name = "NT. 53 'Sandman' grenade" diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 59275096c74..260917e4c08 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -1,7 +1,7 @@ /obj/item/weapon/grenade/empgrenade name = "classic emp grenade" icon_state = "emp" - item_state = "empgrenade" + item_state = "emp" origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3) /obj/item/weapon/grenade/empgrenade/prime() diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 575bec889b1..30415fef794 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -9,6 +9,7 @@ throw_range = 20 flags = CONDUCT slot_flags = SLOT_BELT + contained_sprite = 1 var/active = 0 var/det_time = 30 var/fake = FALSE diff --git a/html/changelogs/Ferner-190609-sprites_grenades.yml b/html/changelogs/Ferner-190609-sprites_grenades.yml new file mode 100644 index 00000000000..6ad361eb7fd --- /dev/null +++ b/html/changelogs/Ferner-190609-sprites_grenades.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: AmoryBlaine, Ferner + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Replaced the grenade sprites with new ones made by AmoryBlaine." diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi index 74a58efc546c5d85e6b740b037d1031d876f2a68..20b99d22025d51bea6cea0ac242e8abfbeb233a9 100644 GIT binary patch literal 5604 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