diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index c50b0fae..8a2959c5 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -760,6 +760,7 @@ /obj/item/toy/plush/bird/kenk name = "kenku plushie" desc = "An adorable stuffed plushie that resembles a kenku, perfect to sit on." + young = TRUE icon_state = "kenk" item_state = "kenk" squeak_override = list('modular_citadel/sound/voice/merp.ogg' = 1) diff --git a/hyperstation/code/modules/resize/sizegun.dm b/hyperstation/code/modules/resize/sizegun.dm index d1154838..246b8a58 100644 --- a/hyperstation/code/modules/resize/sizegun.dm +++ b/hyperstation/code/modules/resize/sizegun.dm @@ -8,10 +8,10 @@ pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE /obj/item/projectile/sizelaser/shrinkray - icon_state="bluelaser" + icon_state = "bluelaser" /obj/item/projectile/sizelaser/growthray - icon_state="laser" + icon_state = "laser" /obj/item/projectile/sizelaser/shrinkray/on_hit(var/atom/target, var/blocked = 0) if(istype(target, /mob/living/carbon/human)) @@ -71,16 +71,16 @@ item_state = null ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray, /obj/item/ammo_casing/energy/laser/growthray) selfcharge = EGUN_SELFCHARGE - charge_delay = 5 + charge_delay = 1 //it's a debug, make it go fast. ammo_x_offset = 2 clumsy_check = 1 - attackby(obj/item/W, mob/user) - if(W==src) - if(icon_state=="bluetag") - icon_state="redtag" - ammo_type = list(/obj/item/ammo_casing/energy/laser/growthray) - else - icon_state="bluetag" - ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray) - return ..() +/obj/item/gun/energy/laser/sizeray/update_overlays() + . = ..() + var/current_index = current_firemode_index + if(current_index == 1) + icon_state = "redtag" + else + icon_state = "bluetag" + +//Attack self is not needed, if ammo_type is a list, the parent code will deal with it diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm index 4e56c7b7..fee935c6 100644 --- a/hyperstation/code/obj/plushes.dm +++ b/hyperstation/code/obj/plushes.dm @@ -70,3 +70,16 @@ light_power = 0.25 light_range = 1.4 attack_verb = list("bapped", "slapped", "bonked") + +//Vladplush containment starts here +/obj/item/toy/plush/nukeplushie/vladin + name = "elite operative plushie" + desc = "A stuffed toy that resembles an elite syndicate nuclear operative. He has a little wedding band!" + gender = MALE //he's a boy, there is no doubt here + young = TRUE //he's not actually young, but i refuse to have a plush that is not loyal to his partner. this is the only way i could figure out. + icon = 'hyperstation/icons/obj/plushes.dmi' + icon_state = "vladin" + item_state = "vladin" + attack_verb = list("nuked", "detonated", "CQC'd", "robusted") + squeak_override = list('sound/effects/hit_punch.ogg' = 1, 'sound/effects/hit_kick.ogg' = 1, 'sound/weapons/cqchit1.ogg' = 1, 'sound/weapons/cqchit2.ogg' = 1) +//I can't figure out how to make him loyal to a specific type of plush. If anyone figures that out, there will be more. Until then, this is the end of the vladplush. \ No newline at end of file diff --git a/hyperstation/icons/obj/plushes.dmi b/hyperstation/icons/obj/plushes.dmi index 506e145f..5083e962 100644 Binary files a/hyperstation/icons/obj/plushes.dmi and b/hyperstation/icons/obj/plushes.dmi differ