cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1604 from TheDZD/helper

Browse Source 
Subtypesof Helper Proc
This commit is contained in:
Fox-McCloud
2015-08-03 17:44:01 -04:00
parent 525955d8bf 445b65c13f
commit 82f62da60f
55 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/random_items.dm
+2 -2
View File
@@ -5,7 +5,7 @@
name = "Random Toy"
New()
..()
var/list/types = list(/obj/item/toy/crossbow,/obj/item/toy/balloon,/obj/item/toy/spinningtoy,/obj/item/weapon/reagent_containers/spray/waterflower) + typesof(/obj/item/toy/prize) - /obj/item/toy/prize
var/list/types = list(/obj/item/toy/crossbow,/obj/item/toy/balloon,/obj/item/toy/spinningtoy,/obj/item/weapon/reagent_containers/spray/waterflower) + subtypesof(/obj/item/toy/prize)
var/T = pick(types)
new T(loc)
spawn(1)
@@ -19,7 +19,7 @@
name = "Random Mess"
New()
..()
var/list/list = typesof(/obj/effect/decal/cleanable) - list(/obj/effect/decal/cleanable,/obj/effect/decal/cleanable/random,/obj/effect/decal/cleanable/cobweb,/obj/effect/decal/cleanable/cobweb2)
var/list/list = subtypesof(/obj/effect/decal/cleanable) - list(/obj/effect/decal/cleanable/random,/obj/effect/decal/cleanable/cobweb,/obj/effect/decal/cleanable/cobweb2)
var/T = pick(list)
new T(loc)
spawn(0)
code/game/objects/structures/barsign.dm
+1 -1
View File
@@ -20,7 +20,7 @@
//filling the barsigns list
for(var/bartype in typesof(/datum/barsign) - /datum/barsign)
for(var/bartype in subtypesof(/datum/barsign))
var/datum/barsign/signinfo = new bartype
if(!signinfo.hidden)
barsigns += signinfo