diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index cfee528ea8c..a54a4da668c 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -28,9 +28,8 @@ var/mob/living/carbon/C = src.loc var/turf/location = get_turf(C) new /obj/effect/decal/cleanable/ash(location) - var/obj/item/stack/rods/R = new /obj/item/stack/rods + new /obj/item/stack/rods(location) del(src) - C.put_in_hands(R) return else del(src) @@ -77,7 +76,7 @@ /obj/item/flag/proc/update_icons() overlays = null overlays += image('icons/obj/flag.dmi', src , "fire") -// item_state = "[icon_state]_fire" Waiting for new in-hands + item_state = "[icon_state]_fire" /obj/item/flag/nt name = "Nanotrasen flag" diff --git a/icons/mob/in-hand/in-hand_sync_report.txt b/icons/mob/in-hand/in-hand_sync_report.txt index 2f094bfbd47..88ffed6bd34 100644 --- a/icons/mob/in-hand/in-hand_sync_report.txt +++ b/icons/mob/in-hand/in-hand_sync_report.txt @@ -8,24 +8,40 @@ --- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\flags_left.dmi +++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\flags_left.dmi + atmosflag + + atmosflag_fire + cargoflag + + cargoflag_fire + cargoflag_old + clownflag + + clownflag_fire + fire + greyflag + + greyflag_fire + medflag + + medflag_fire + mimeflag + + mimeflag_fire + ninjaflag + + ninjaflag_fire + ntflag + + ntflag_fire + ponyflag + + ponyflag_fire + rndflag + + rndflag_fire + secflag + + secflag_fire + secflag_old + skrellflag + + skrellflag_fire + slimeflag + + slimeflag_fire + syndiflag + + syndiflag_fire + voxflag + + voxflag_fire + wizflag + + wizflag_fire --- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\guns.dmi +++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\guns.dmi + scythe0 diff --git a/icons/mob/in-hand/left/flags_left.dmi b/icons/mob/in-hand/left/flags_left.dmi index 79a60a106e3..c2dbfd0966d 100644 Binary files a/icons/mob/in-hand/left/flags_left.dmi and b/icons/mob/in-hand/left/flags_left.dmi differ diff --git a/icons/mob/in-hand/right/flags_right.dmi b/icons/mob/in-hand/right/flags_right.dmi index 96e92b0e42e..7ee8889a9f2 100644 Binary files a/icons/mob/in-hand/right/flags_right.dmi and b/icons/mob/in-hand/right/flags_right.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index d57de90acd1..faa1e8c7fce 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index bb82f72d8c6..fd08c74ddcb 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ