cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes all toy figurines tiny and refactors the code behind it (#15368)

Browse Source 
* 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:
Farie82
2021-07-15 13:59:26 +01:00
committed by GitHub
co-authored by dearmochi joep van der velden
parent 036a69fea4
commit 64930de41c
15 changed files with 286 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/random_items.dm
+3 -3
View File
@@ -4,12 +4,12 @@
/obj/item/toy/random
name = "Random Toy"
/obj/item/toy/random/New()
/obj/item/toy/random/Initialize(mapload)
..()
var/list/types = list(/obj/item/gun/projectile/shotgun/toy/crossbow, /obj/item/toy/balloon,/obj/item/toy/spinningtoy,/obj/item/reagent_containers/spray/waterflower) + subtypesof(/obj/item/toy/prize)
var/list/types = list(/obj/item/gun/projectile/shotgun/toy/crossbow, /obj/item/toy/balloon,/obj/item/toy/spinningtoy,/obj/item/reagent_containers/spray/waterflower) + subtypesof(/obj/item/toy/figure/mech)
var/T = pick(types)
new T(loc)
qdel(src)
return INITIALIZE_HINT_QDEL
// -------------------------------------
// Random cleanables, clearly this makes sense