diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index dad171e0e59..7328915cc43 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1261,10 +1261,12 @@ products = list(/obj/item/clothing/accessory/petcollar = 5, /obj/item/weapon/fish_net = 5, /obj/item/weapon/fishfood = 5, /obj/item/weapon/tank_brush = 5, /obj/item/weapon/egg_scoop = 5, /obj/item/fish_eggs/goldfish = 5, /obj/item/fish_eggs/clownfish = 5, /obj/item/fish_eggs/shark = 5, /obj/item/toy/pet_rock = 5, + /obj/item/weapon/lazarus_injector = 5, ) prices = list(/obj/item/clothing/accessory/petcollar = 50, /obj/item/weapon/fish_net = 15, /obj/item/weapon/fishfood = 15, /obj/item/weapon/tank_brush = 15, /obj/item/weapon/egg_scoop = 15, /obj/item/fish_eggs/goldfish = 10, /obj/item/fish_eggs/clownfish = 10, /obj/item/fish_eggs/shark = 10, /obj/item/toy/pet_rock = 100, + /obj/item/weapon/lazarus_injector = 300, ) contraband = list(/obj/item/fish_eggs/babycarp = 5) premium = list(/obj/item/toy/pet_rock/fred = 1, /obj/item/toy/pet_rock/roxie = 1) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 702a87ab336..b3179aa7a07 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -579,10 +579,9 @@ /obj/item/weapon/lazarus_injector name = "lazarus injector" desc = "An injector with a cocktail of nanomachines and chemicals, this device can seemingly raise animals from the dead, making them become friendly to the user. Unfortunately, the process is useless on higher forms of life and incredibly costly, so these were hidden in storage until an executive thought they'd be great motivation for some of their employees." - icon = 'icons/obj/syringe.dmi' + icon = 'icons/obj/syringesyringe.dmi' icon_state = "lazarus_hypo" item_state = "hypo" - icon_override = 'icons/mob/in-hand/tools.dmi' throwforce = 0 w_class = 2.0 throw_speed = 3 diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index b2e0408b7e4..8d3a43e9ab4 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -363,6 +363,11 @@ desc = "That's not red paint. That's real corgi blood." valid = 1 + if(/obj/item/clothing/mask/fakemoustache) + name = "Definitely Not [real_name]" + desc = "That's Definitely Not [real_name]" + valid = 1 + if(valid) if(user && !user.drop_item()) user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!" diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 2a7e92f3fcb..be1f3baa252 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ