mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Merge pull request #13393 from kingofkosmos/fewinhandsprites
In-hand sprites: transfer tank valve, tracking beacon, pizza box & carp plushie
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
desc = "A box suited for pizzas."
|
desc = "A box suited for pizzas."
|
||||||
icon = 'icons/obj/food/containers.dmi'
|
icon = 'icons/obj/food/containers.dmi'
|
||||||
icon_state = "pizzabox1"
|
icon_state = "pizzabox1"
|
||||||
|
item_state = "pizzabox"
|
||||||
burn_state = 0 //Burnable
|
burn_state = 0 //Burnable
|
||||||
var/timer = 10 //Adjustable timer
|
var/timer = 10 //Adjustable timer
|
||||||
var/timer_set = 0
|
var/timer_set = 0
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
name = "tracking beacon"
|
name = "tracking beacon"
|
||||||
desc = "A beacon used by a teleporter."
|
desc = "A beacon used by a teleporter."
|
||||||
icon_state = "beacon"
|
icon_state = "beacon"
|
||||||
item_state = "signaler"
|
item_state = "beacon"
|
||||||
var/code = "electronic"
|
var/code = "electronic"
|
||||||
origin_tech = "bluespace=1"
|
origin_tech = "bluespace=1"
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
icon = 'icons/obj/assemblies.dmi'
|
icon = 'icons/obj/assemblies.dmi'
|
||||||
name = "tank transfer valve"
|
name = "tank transfer valve"
|
||||||
icon_state = "valve_1"
|
icon_state = "valve_1"
|
||||||
|
item_state = "ttv"
|
||||||
desc = "Regulates the transfer of air between two tanks"
|
desc = "Regulates the transfer of air between two tanks"
|
||||||
var/obj/item/weapon/tank/tank_one
|
var/obj/item/weapon/tank/tank_one
|
||||||
var/obj/item/weapon/tank/tank_two
|
var/obj/item/weapon/tank/tank_two
|
||||||
|
|||||||
@@ -1127,6 +1127,7 @@
|
|||||||
desc = "An adorable stuffed toy that resembles a space carp."
|
desc = "An adorable stuffed toy that resembles a space carp."
|
||||||
icon = 'icons/obj/toy.dmi'
|
icon = 'icons/obj/toy.dmi'
|
||||||
icon_state = "carpplushie"
|
icon_state = "carpplushie"
|
||||||
|
item_state = "carp_plushie"
|
||||||
w_class = 2
|
w_class = 2
|
||||||
attack_verb = list("bitten", "eaten", "fin slapped")
|
attack_verb = list("bitten", "eaten", "fin slapped")
|
||||||
burn_state = 0 //Burnable
|
burn_state = 0 //Burnable
|
||||||
|
|||||||
@@ -118,6 +118,7 @@
|
|||||||
desc = "A box suited for pizzas."
|
desc = "A box suited for pizzas."
|
||||||
icon = 'icons/obj/food/containers.dmi'
|
icon = 'icons/obj/food/containers.dmi'
|
||||||
icon_state = "pizzabox1"
|
icon_state = "pizzabox1"
|
||||||
|
item_state = "pizzabox"
|
||||||
var/open = 0 // Is the box open?
|
var/open = 0 // Is the box open?
|
||||||
var/ismessy = 0 // Fancy mess on the lid
|
var/ismessy = 0 // Fancy mess on the lid
|
||||||
var/obj/item/weapon/reagent_containers/food/snacks/pizza/pizza // Content pizza
|
var/obj/item/weapon/reagent_containers/food/snacks/pizza/pizza // Content pizza
|
||||||
|
|||||||
@@ -33,7 +33,6 @@
|
|||||||
name = "bluespace rapid part exchange device"
|
name = "bluespace rapid part exchange device"
|
||||||
desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts."
|
desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts."
|
||||||
icon_state = "BS_RPED"
|
icon_state = "BS_RPED"
|
||||||
item_state = "BS_RPED"
|
|
||||||
w_class = 3
|
w_class = 3
|
||||||
storage_slots = 400
|
storage_slots = 400
|
||||||
max_w_class = 3
|
max_w_class = 3
|
||||||
|
|||||||
@@ -86,7 +86,7 @@
|
|||||||
desc = "Use to warp in a cargo telepad."
|
desc = "Use to warp in a cargo telepad."
|
||||||
icon = 'icons/obj/radio.dmi'
|
icon = 'icons/obj/radio.dmi'
|
||||||
icon_state = "beacon"
|
icon_state = "beacon"
|
||||||
item_state = "signaler"
|
item_state = "beacon"
|
||||||
origin_tech = "bluespace=3"
|
origin_tech = "bluespace=3"
|
||||||
|
|
||||||
/obj/item/device/telepad_beacon/attack_self(mob/user)
|
/obj/item/device/telepad_beacon/attack_self(mob/user)
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 104 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 102 KiB |
Reference in New Issue
Block a user