cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13063 from Incoming5643/subtypesof

Browse Source 
Adds subtypesof(path)
This commit is contained in:
Cheridan
2015-11-19 16:31:09 -06:00
parent 8994f03377 e03f468c7e
commit 4c899d2b34
46 changed files with 73 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/gift_wrappaper.dm
+2 -2
View File
@@ -60,8 +60,8 @@
/obj/item/clothing/suit/poncho/green,
/obj/item/clothing/suit/poncho/red)
gift_type_list += typesof(/obj/item/clothing/head/collectable) - /obj/item/clothing/head/collectable
gift_type_list += typesof(/obj/item/toy) - (((typesof(/obj/item/toy/cards) - /obj/item/toy/cards/deck) + /obj/item/toy/ammo) + /obj/item/toy) //All toys, except for abstract types and syndicate cards.
gift_type_list += subtypesof(/obj/item/clothing/head/collectable)
gift_type_list += subtypesof(/obj/item/toy) - (((typesof(/obj/item/toy/cards) - /obj/item/toy/cards/deck) + /obj/item/toy/ammo)) //All toys, except for abstract types and syndicate cards.
var/gift_type = pick(gift_type_list)
code/game/objects/structures/barsigns.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
code/game/objects/structures/mirror.dm
+2 -2
View File
@@ -131,7 +131,7 @@
/obj/structure/mirror/magic/New()
if(!choosable_races.len)
for(var/speciestype in typesof(/datum/species) - /datum/species)
for(var/speciestype in subtypesof(/datum/species))
var/datum/species/S = new speciestype()
if(!(S.id in races_blacklist))
choosable_races += S.id
@@ -142,7 +142,7 @@
..()
/obj/structure/mirror/magic/badmin/New()
for(var/speciestype in typesof(/datum/species) - /datum/species)
for(var/speciestype in subtypesof(/datum/species))
var/datum/species/S = new speciestype()
choosable_races += S.id
..()