mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-19 23:01:35 +00:00
Makes all toy figurines tiny and refactors the code behind it (#15368)
* Makes toy figures tiny and refactors the code behind it * Apply suggestions from code review Co-authored-by: dearmochi <shenesis@gmail.com> * atom_say and capitalize names * Web edit baby * Merge conflict fixes * Init instead of New * prize_ball instead of mechball * prize_ball should not be a figure. Revert but keep the Init change Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com> Co-authored-by: dearmochi <shenesis@gmail.com>
This commit is contained in:
@@ -10,8 +10,8 @@
|
||||
var/opening = 0
|
||||
var/possible_contents = list(/obj/random/carp_plushie, /obj/random/plushie, /obj/random/figure, /obj/item/toy/eight_ball, /obj/item/stack/tickets)
|
||||
|
||||
/obj/item/toy/prizeball/New()
|
||||
..()
|
||||
/obj/item/toy/prizeball/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = pick("prizeball_1","prizeball_2","prizeball_3")
|
||||
|
||||
/obj/item/toy/prizeball/attack_self(mob/user as mob)
|
||||
|
||||
@@ -200,7 +200,7 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new())
|
||||
/datum/prize_item/toy_xeno
|
||||
name = "Xeno Action Figure"
|
||||
desc = "A lifelike replica of the horrific xeno scourge."
|
||||
typepath = /obj/item/toy/toy_xeno
|
||||
typepath = /obj/item/toy/figure/xeno
|
||||
cost = 80
|
||||
|
||||
/datum/prize_item/rubberducky
|
||||
@@ -272,13 +272,13 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new())
|
||||
/datum/prize_item/owl
|
||||
name = "Owl Action Figure"
|
||||
desc = "Remember: heroes don't grief!"
|
||||
typepath = /obj/item/toy/owl
|
||||
typepath = /obj/item/toy/figure/owl
|
||||
cost = 125
|
||||
|
||||
/datum/prize_item/griffin
|
||||
name = "Griffin Action Figure"
|
||||
desc = "If you can't be the best, you can always be the WORST."
|
||||
typepath = /obj/item/toy/griffin
|
||||
typepath = /obj/item/toy/figure/griffin
|
||||
cost = 125
|
||||
|
||||
/datum/prize_item/codex_gigas
|
||||
|
||||
Reference in New Issue
Block a user