shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push

Browse Source
This commit is contained in:
SandPoot
2024-08-25 04:38:03 -03:00
parent 98877f529c
commit dc08550162
30 changed files with 870 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/packs/costumes_toys.dm
+19 -13
View File
@@ -150,24 +150,30 @@
/obj/item/toy/talking/AI,
/obj/item/toy/talking/codex_gigas,
/obj/item/clothing/under/syndicate/tacticool,
/obj/item/toy/sword ,
/obj/item/toy/sword,
/obj/item/toy/gun,
/obj/item/gun/ballistic/shotgun/toy/crossbow,
/obj/item/storage/box/fakesyndiesuit,
/obj/item/storage/crayons,
/obj/item/toy/spinningtoy,
/obj/item/toy/prize/ripley,
/obj/item/toy/prize/fireripley,
/obj/item/toy/prize/deathripley,
/obj/item/toy/prize/gygax,
/obj/item/toy/prize/durand,
/obj/item/toy/prize/honk,
/obj/item/toy/prize/marauder,
/obj/item/toy/prize/seraph,
/obj/item/toy/prize/mauler,
/obj/item/toy/prize/odysseus,
/obj/item/toy/prize/phazon,
/obj/item/toy/prize/reticence,
/obj/item/toy/mecha/ripley,
/obj/item/toy/mecha/ripleymkii,
/obj/item/toy/mecha/hauler,
/obj/item/toy/mecha/clarke,
/obj/item/toy/mecha/odysseus,
/obj/item/toy/mecha/gygax,
/obj/item/toy/mecha/durand,
/obj/item/toy/mecha/savannahivanov,
/obj/item/toy/mecha/phazon,
/obj/item/toy/mecha/honk,
/obj/item/toy/mecha/darkgygax,
/obj/item/toy/mecha/mauler,
/obj/item/toy/mecha/darkhonk,
/obj/item/toy/mecha/deathripley,
/obj/item/toy/mecha/reticence,
/obj/item/toy/mecha/marauder,
/obj/item/toy/mecha/seraph,
/obj/item/toy/mecha/firefighter,
/obj/item/toy/cards/deck,
/obj/item/toy/nuke,
/obj/item/toy/minimeteor,
code/modules/clothing/head/collectable.dm
+5
View File
@@ -4,6 +4,11 @@
/obj/item/clothing/head/collectable
name = "collectable hat"
desc = "A rare collectable hat."
icon_state = null
/obj/item/clothing/head/collectable/Initialize()
. = ..()
AddElement(/datum/element/series, /obj/item/clothing/head/collectable, "Super duper collectable hats")
/obj/item/clothing/head/collectable/petehat
name = "ultra rare Pete's hat!"
code/modules/events/holiday/vday.dm
+1 -1
View File
@@ -40,7 +40,7 @@
/obj/item/valentine
name = "valentine"
desc = "A Valentine's card! Wonder what it says..."
icon = 'icons/obj/toy.dmi'
icon = 'icons/obj/toys/toy.dmi'
icon_state = "sc_Ace of Hearts_syndicate" // shut up
var/message = "A generic message of love or whatever."
resistance_flags = FLAMMABLE
code/modules/games/cas.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/obj/item/toy/cards/deck/cas
name = "\improper CAS deck (white)"
desc = "A deck for the game Cards Against Spess, still popular after all these centuries. Warning: may include traces of broken fourth wall. This is the white deck."
icon = 'icons/obj/toy.dmi'
icon = 'icons/obj/toys/toy.dmi'
icon_state = "deck_caswhite_full"
deckstyle = "caswhite"
var/card_face = "cas_white"
code/modules/games/unum.dm
+1 -1
View File
@@ -2,7 +2,7 @@
/obj/item/toy/cards/deck/unum
name = "\improper UNUM deck"
desc = "A deck of unum cards. House rules to argue over not included."
icon = 'icons/obj/toy.dmi'
icon = 'icons/obj/toys/toy.dmi'
icon_state = "deck_unum_full"
deckstyle = "unum"
original_size = 108
code/modules/holiday/easter.dm
+4 -5
View File
@@ -118,7 +118,7 @@
var/eggcolor = pick("blue","green","mime","orange","purple","rainbow","red","yellow")
icon_state = "egg-[eggcolor]"
/obj/item/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where)
var/won = pick(/obj/item/clothing/head/bunnyhead,
var/prize_list = list(/obj/item/clothing/head/bunnyhead,
/obj/item/clothing/suit/bunnysuit,
/obj/item/reagent_containers/food/snacks/grown/carrot,
/obj/item/reagent_containers/food/snacks/chocolateegg,
@@ -126,13 +126,12 @@
/obj/item/toy/gun,
/obj/item/toy/sword,
/obj/item/toy/foamblade,
/obj/item/toy/prize/ripley,
/obj/item/toy/prize/honk,
/obj/item/toy/plush/carpplushie,
/obj/item/toy/redbutton,
/obj/item/clothing/head/collectable/rabbitears)
/obj/item/clothing/head/collectable/rabbitears) + subtypesof(/obj/item/toy/mecha)
var/won = pick(prize_list)
new won(where)
new/obj/item/reagent_containers/food/snacks/chocolateegg(where)
new /obj/item/reagent_containers/food/snacks/chocolateegg(where)
/obj/item/reagent_containers/food/snacks/egg/attack_self(mob/user)
..()
code/modules/holodeck/holo_effect.dm
+1 -1
View File
@@ -26,7 +26,7 @@
// Generates a holodeck-tracked card deck
/obj/effect/holodeck_effect/cards
icon = 'icons/obj/toy.dmi'
icon = 'icons/obj/toys/toy.dmi'
icon_state = "deck_nanotrasen_full"
var/obj/item/toy/cards/deck/D
code/modules/jobs/job_types/roboticist.dm
+5 -1
View File
@@ -27,7 +27,7 @@
threat = 1
family_heirlooms = list(
/obj/item/toy/figure/borg
/obj/item/toy/figure/borg,
)
mail_goodies = list(
@@ -36,6 +36,10 @@
/obj/item/modular_computer/tablet/preset/advanced = 5
)
/datum/job/roboticist/New()
. = ..()
family_heirlooms += subtypesof(/obj/item/toy/mecha)
/datum/outfit/job/roboticist
name = "Roboticist"
jobtype = /datum/job/roboticist
code/modules/mining/abandoned_crates.dm
+1 -1
View File
@@ -61,7 +61,7 @@
if(53 to 54)
new /obj/item/toy/balloon(src)
if(55 to 56)
var/newitem = pick(subtypesof(/obj/item/toy/prize))
var/newitem = pick(subtypesof(/obj/item/toy/mecha))
new newitem(src)
if(57 to 58)
new /obj/item/toy/syndicateballoon(src)
code/modules/mob/living/simple_animal/guardian/guardian.dm
+1 -1
View File
@@ -512,7 +512,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
/obj/item/guardiancreator
name = "deck of tarot cards"
desc = "An enchanted deck of tarot cards, rumored to be a source of unimaginable power."
icon = 'icons/obj/toy.dmi'
icon = 'icons/obj/toys/toy.dmi'
icon_state = "deck_syndicate_full"
var/used = FALSE
var/theme = "magic"
code/modules/pool/pool_noodles.dm
+1 -1
View File
@@ -1,7 +1,7 @@
//Pool noodles
/obj/item/toy/poolnoodle
icon = 'icons/obj/toy.dmi'
icon = 'icons/obj/toys/toy.dmi'
icon_state = "noodle"
name = "pool noodle"
desc = "A strange, bulky, bendable toy that can annoy people."
code/modules/projectiles/guns/ballistic/toy.dm
+1 -1
View File
@@ -69,7 +69,7 @@
/obj/item/gun/ballistic/shotgun/toy/crossbow
name = "foam force crossbow"
desc = "A weapon favored by many overactive children. Ages 8 and up."
icon = 'icons/obj/toy.dmi'
icon = 'icons/obj/toys/toy.dmi'
icon_state = "foamcrossbow"
item_state = "crossbow"
mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
code/modules/reagents/reagent_containers/rags.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "damp rag"
desc = "For cleaning up messes, you suppose."
w_class = WEIGHT_CLASS_TINY
icon = 'icons/obj/toy.dmi'
icon = 'icons/obj/toys/toy.dmi'
icon_state = "rag"
item_flags = NOBLUDGEON
reagent_flags = REFILLABLE | DRAINABLE
code/modules/research/designs/autoylathe_designs.dm
+84 -31
View File
@@ -81,76 +81,129 @@
category = list("initial", "Toys")
/datum/design/autoylathe/mech/model1
name = "Toy Ripley"
name = "Toy Ripley MK-I"
id = "toymech1"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/ripley
build_path = /obj/item/toy/mecha/ripley
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/model2
name = "Toy Firefighter Ripley"
name = "Toy Ripley MK-II"
id = "toymech2"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/fireripley
build_path = /obj/item/toy/mecha/ripleymkii
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model3
name = "Toy Deathsquad fireripley "
/datum/design/autoylathe/mech/model3
name = "Toy Hauler"
id = "toymech3"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/deathripley
build_path = /obj/item/toy/mecha/hauler
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/model4
name = "Toy Gygax"
name = "Toy Clarke"
id = "toymech4"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/gygax
build_path = /obj/item/toy/mecha/clarke
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/model5
name = "Toy Durand"
name = "Toy Odysseus"
id = "toymech5"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/durand
build_path = /obj/item/toy/mecha/odysseus
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model6
name = "Toy H.O.N.K."
/datum/design/autoylathe/mech/model6
name = "Toy Gygax"
id = "toymech6"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/honk
build_path = /obj/item/toy/mecha/gygax
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model7
name = "Toy Marauder"
/datum/design/autoylathe/mech/model7
name = "Toy Durand"
id = "toymech7"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/marauder
build_path = /obj/item/toy/mecha/durand
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model8
name = "Toy Seraph"
/datum/design/autoylathe/mech/model8
name = "Toy Savannah-Ivanov"
id = "toymech8"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/seraph
build_path = /obj/item/toy/mecha/savannahivanov
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model9
name = "Toy Mauler"
/datum/design/autoylathe/mech/model9
name = "Toy Phazon"
id = "toymech9"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/mauler
build_path = /obj/item/toy/mecha/phazon
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/model10
name = "Toy Odysseus"
/datum/design/autoylathe/mech/contraband/model10
name = "Toy H.O.N.K"
id = "toymech10"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/odysseus
build_path = /obj/item/toy/mecha/honk
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/model11
name = "Toy Phazon"
/datum/design/autoylathe/mech/contraband/model11
name = "Toy Dark Gygax"
id = "toymech11"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/phazon
build_path = /obj/item/toy/mecha/darkgygax
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model12
name = "Toy Reticence"
name = "Toy Mauler"
id = "toymech12"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/reticence
build_path = /obj/item/toy/mecha/mauler
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model13
name = "Toy Dark H.O.N.K"
id = "toymech13"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/mecha/darkhonk
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model14
name = "Toy Death-Ripley"
id = "toymech14"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/mecha/deathripley
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model15
name = "Toy Reticence"
id = "toymech15"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/mecha/reticence
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model16
name = "Toy Marauder"
id = "toymech16"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/mecha/marauder
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/contraband/model17
name = "Toy Seraph"
id = "toymech17"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/mecha/seraph
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/model18
name = "Toy Firefighter"
id = "toymech18"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/mecha/firefighter
category = list("hacked", "Figurines")
/datum/design/autoylathe/talking/AI
code/modules/spells/spell_types/wizard.dm
+1 -1
View File
@@ -333,7 +333,7 @@
/obj/item/spellpacket/lightningbolt
name = "\improper Lightning bolt Spell Packet"
desc = "Some birdseed wrapped in cloth that somehow crackles with electricity."
icon = 'icons/obj/toy.dmi'
icon = 'icons/obj/toys/toy.dmi'
icon_state = "snappop"
w_class = WEIGHT_CLASS_TINY