diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 90912f7409..c601624072 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -21,7 +21,7 @@ var/powered = FALSE //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise var/obj/item/shockpaddles/paddles var/obj/item/stock_parts/cell/cell - var/combat = FALSE //can we revive through space suits? + var/combat = FALSE //if true, revive through hardsuits, allow for combat shocking, and tint paddles syndicate colors var/grab_ghost = FALSE // Do we pull the ghost back into their body? var/healdisk = FALSE // Does the unit have the healdisk upgrade? var/pullshocksafely = FALSE // Will we shock people dragging the body? @@ -176,7 +176,9 @@ A.UpdateButtonIcon() /obj/item/defibrillator/proc/make_paddles() - return new /obj/item/shockpaddles(src) + if(!combat) + return new /obj/item/shockpaddles(src) + return new /obj/item/shockpaddles/syndicate(src) /obj/item/defibrillator/equipped(mob/user, slot) ..() @@ -245,6 +247,8 @@ /obj/item/defibrillator/compact/combat name = "combat defibrillator" desc = "A belt-equipped blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits." + icon_state = "defibcombat" //needs defib inhand sprites + item_state = "defibcombat" combat = TRUE safety = FALSE always_emagged = TRUE @@ -279,6 +283,7 @@ var/combat = FALSE //If it penetrates armor and gives additional functionality var/grab_ghost = FALSE var/tlimit = DEFIB_TIME_LIMIT * 10 + var/base_icon_state = "defibpaddles" var/disarm_shock_time = 10 var/wielded = FALSE // track wielded status on item @@ -352,10 +357,10 @@ return (OXYLOSS) /obj/item/shockpaddles/update_icon_state() - icon_state = "defibpaddles[wielded]" - item_state = "defibpaddles[wielded]" + icon_state = "[base_icon_state][wielded]" + item_state = icon_state if(cooldown) - icon_state = "defibpaddles[wielded]_cooldown" + icon_state = "[base_icon_state][wielded]_cooldown" /obj/item/shockpaddles/dropped(mob/user) if(!req_defib) @@ -704,8 +709,9 @@ desc = "A pair of paddles used to revive deceased operatives. It possesses both the ability to penetrate armor and to deliver powerful shocks offensively." combat = TRUE icon = 'icons/obj/defibrillators.dmi' - icon_state = "defibpaddles0" - item_state = "defibpaddles0" + icon_state = "syndiepaddles0" + item_state = "syndiepaddles0" + base_icon_state = "syndiepaddles" req_defib = FALSE /////////////////////////////////////////// diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index acceb331ab..a915a89c73 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -266,6 +266,8 @@ desc = "A wooden rod about the size of your forearm with a snake carved around it, winding it's way up the sides of the rod. Something about it seems to inspire in you the responsibilty and duty to help others." icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "asclepius_dormant" + lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' var/activated = FALSE var/usedHand diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index f3f2eaa90b..9d6ec7253d 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index ad3dede201..232f3f9e65 100644 Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi index de57235f29..8133cca9bd 100644 Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 6f747f1265..384159b299 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index af14ba7784..3d22f8d4b1 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/staves_lefthand.dmi b/icons/mob/inhands/weapons/staves_lefthand.dmi index 8851fd8e7b..f35665cb06 100644 Binary files a/icons/mob/inhands/weapons/staves_lefthand.dmi and b/icons/mob/inhands/weapons/staves_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/staves_righthand.dmi b/icons/mob/inhands/weapons/staves_righthand.dmi index 4d02fcb383..407682cc98 100644 Binary files a/icons/mob/inhands/weapons/staves_righthand.dmi and b/icons/mob/inhands/weapons/staves_righthand.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index f20dc86be5..e5bd686603 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/defibrillators.dmi b/icons/obj/defibrillators.dmi index f838f40030..a4dc9e65e3 100644 Binary files a/icons/obj/defibrillators.dmi and b/icons/obj/defibrillators.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index b0e542f618..2676fec5d9 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ