diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 0e355d774f..f00f3f3394 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -90,17 +90,33 @@ - ToyFigurinePassenger - ToyFigurineClown - ToyFigurineMime + - ToyFigurineMusician + - ToyFigurineBoxer - ToyFigurineCaptain + - ToyFigurineHeadOfSecurity + - ToyFigurineWarden + - ToyFigurineDetective - ToyFigurineSecurity + - ToyFigurineLawyer - ToyFigurineCargoTech - ToyFigurineSalvage - ToyFigurineQuartermaster + - ToyFigurineChiefEngineer - ToyFigurineAtmosTech - - ToyFigurineEngineer - ToyFigurineEngineer + - ToyFigurineResearchDirector - ToyFigurineScientist + - ToyFigurineChiefMedicalOfficer + - ToyFigurineChemist + - ToyFigurineParamedic - ToyFigurineMedicalDoctor + - ToyFigurineHeadOfPersonnel - ToyFigurineLibrarian + - ToyFigurineChaplain + - ToyFigurineChef + - ToyFigurineBartender + - ToyFigurineBotanist + - ToyFigurineJanitor - ToyFigurineNukie - ToyFigurineFootsoldier - ToyFigurineWizardFake @@ -111,5 +127,10 @@ - ToyOwlman - ToySkeleton - ToyFigurineQueen + - ToyFigurineSpaceDragon + - ToyFigurineRatKing + - ToyFigurineRatServant + - ToyFigurineMouse + - ToyFigurineHamlet chance: 0.90 offset: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml index 4e43af4b90..dbbe86678f 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml @@ -34,28 +34,60 @@ orGroup: SpacemenFig - id: ToyFigurineMime orGroup: SpacemenFig + - id: ToyFigurineMusician + orGroup: SpacemenFig + - id: ToyFigurineBoxer + orGroup: SpacemenFig - id: ToyFigurineCaptain orGroup: SpacemenFig + - id: ToyFigurineHeadOfSecurity + orGroup: SpacemenFig + - id: ToyFigurineWarden + orGroup: SpacemenFig + - id: ToyFigurineDetective + orGroup: SpacemenFig - id: ToyFigurineSecurity orGroup: SpacemenFig + - id: ToyFigurineLawyer + orGroup: SpacemenFig - id: ToyFigurineCargoTech orGroup: SpacemenFig - id: ToyFigurineSalvage orGroup: SpacemenFig - id: ToyFigurineQuartermaster orGroup: SpacemenFig + - id: ToyFigurineChiefEngineer + orGroup: SpacemenFig - id: ToyFigurineAtmosTech orGroup: SpacemenFig - id: ToyFigurineEngineer orGroup: SpacemenFig - - id: ToyFigurineEngineer + - id: ToyFigurineResearchDirector orGroup: SpacemenFig - id: ToyFigurineScientist orGroup: SpacemenFig + - id: ToyFigurineChiefMedicalOfficer + orGroup: SpacemenFig + - id: ToyFigurineChemist + orGroup: SpacemenFig + - id: ToyFigurineParamedic + orGroup: SpacemenFig - id: ToyFigurineMedicalDoctor orGroup: SpacemenFig + - id: ToyFigurineHeadOfPersonnel + orGroup: SpacemenFig - id: ToyFigurineLibrarian orGroup: SpacemenFig + - id: ToyFigurineChaplain + orGroup: SpacemenFig + - id: ToyFigurineChef + orGroup: SpacemenFig + - id: ToyFigurineBartender + orGroup: SpacemenFig + - id: ToyFigurineBotanist + orGroup: SpacemenFig + - id: ToyFigurineJanitor + orGroup: SpacemenFig - id: ToyFigurineNukie orGroup: SpacemenFig - id: ToyFigurineNukieElite @@ -83,6 +115,21 @@ - id: ToySkeleton prob: 0.50 orGroup: SpacemenFig + - id: ToyFigurineRatKing + prob: 0.30 + orGroup: SpacemenFig + - id: ToyFigurineRatServant + prob: 0.40 + orGroup: SpacemenFig + - id: ToyFigurineMouse + prob: 0.50 + orGroup: SpacemenFig - id: ToyFigurineQueen prob: 0.25 - orGroup: SpacemenFig \ No newline at end of file + orGroup: SpacemenFig + - id: ToyFigurineSpaceDragon + prob: 0.10 + orGroup: SpacemenFig + - id: ToyFigurineHamlet + prob: 0.20 + orGroup: SpacemenFig diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index 4ea2084d76..8aa71731fa 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -17,6 +17,15 @@ - type: Tag tags: - Figurine + +- type: entity + parent: BaseFigurine + id: ToyFigurineHeadOfPersonnel + name: head of personnel figure + description: A figurine depicting the glorious head of all personnel, away from their office as usual. + components: + - type: Sprite + state: hop - type: entity parent: BaseFigurine @@ -54,6 +63,24 @@ - type: Sprite state: mime +- type: entity + parent: BaseFigurine + id: ToyFigurineMusician + name: musician figure + description: A figurine depicting a Musician, his music was electrifying. + components: + - type: Sprite + state: musician + +- type: entity + parent: BaseFigurine + id: ToyFigurineBoxer + name: boxer figure + description: A figurine depicting a Boxer holding their red gloves. + components: + - type: Sprite + state: boxer + - type: entity parent: BaseFigurine id: ToyFigurineCaptain @@ -62,7 +89,34 @@ components: - type: Sprite state: captain - + +- type: entity + parent: BaseFigurine + id: ToyFigurineHeadOfSecurity + name: head of security figure + description: A figurine depicting the glorious head of the Security department. + components: + - type: Sprite + state: hos + +- type: entity + parent: BaseFigurine + id: ToyFigurineWarden + name: warden figure + description: A figurine depicting a Warden, ready to jail someone at any moment. + components: + - type: Sprite + state: warden + +- type: entity + parent: BaseFigurine + id: ToyFigurineDetective + name: detective figure + description: A figurine depicting a Detective wearing their iconic trench coat. + components: + - type: Sprite + state: detective + - type: entity parent: BaseFigurine id: ToyFigurineSecurity @@ -72,6 +126,15 @@ - type: Sprite state: security +- type: entity + parent: BaseFigurine + id: ToyFigurineLawyer + name: lawyer figure + description: A figurine depicting a Lawyer sporting a freshly tailored suit. + components: + - type: Sprite + state: lawyer + - type: entity parent: BaseFigurine id: ToyFigurineCargoTech @@ -99,6 +162,15 @@ - type: Sprite state: qm +- type: entity + parent: BaseFigurine + id: ToyFigurineChiefEngineer + name: chief engineer figure + description: A figurine depicting the glorious head of the Engineering department. + components: + - type: Sprite + state: ce + - type: entity parent: BaseFigurine id: ToyFigurineEngineer @@ -117,6 +189,15 @@ - type: Sprite state: atmos +- type: entity + parent: BaseFigurine + id: ToyFigurineResearchDirector + name: research director figure + description: A figurine depicting the glorious head of the Science department. + components: + - type: Sprite + state: rd + - type: entity parent: BaseFigurine id: ToyFigurineScientist @@ -126,6 +207,33 @@ - type: Sprite state: scientist +- type: entity + parent: BaseFigurine + id: ToyFigurineChiefMedicalOfficer + name: chief medical officer figure + description: A figurine depicting the glorious head of the Medical department. + components: + - type: Sprite + state: cmo + +- type: entity + parent: BaseFigurine + id: ToyFigurineChemist + name: chemist figure + description: A figurine depicting a Chemist probably planning to make meth. + components: + - type: Sprite + state: chemist + +- type: entity + parent: BaseFigurine + id: ToyFigurineParamedic + name: paramedic figure + description: A figurine depicting a Paramedic wearing their void suit. + components: + - type: Sprite + state: paramedic + - type: entity parent: BaseFigurine id: ToyFigurineMedicalDoctor @@ -144,6 +252,51 @@ - type: Sprite state: librarian +- type: entity + parent: BaseFigurine + id: ToyFigurineChaplain + name: chaplain figure + description: A figurine depicting a Chaplain hopefully praying for good things. + components: + - type: Sprite + state: chaplain + +- type: entity + parent: BaseFigurine + id: ToyFigurineChef + name: chef figure + description: A figurine depicting a chef, master of the culinary arts!.. most of the time. + components: + - type: Sprite + state: chef + +- type: entity + parent: BaseFigurine + id: ToyFigurineBartender + name: bartender figure + description: A figurine depicting a Bartender looking stylish with their rockin shades and tophat. + components: + - type: Sprite + state: bartender + +- type: entity + parent: BaseFigurine + id: ToyFigurineBotanist + name: botanist figure + description: A figurine depicting a Botanist that surely won't let kudzu get out of control. + components: + - type: Sprite + state: botanist + +- type: entity + parent: BaseFigurine + id: ToyFigurineJanitor + name: janitor figure + description: A figurine depicting a Janitor with their galoshes. + components: + - type: Sprite + state: janitor + - type: entity parent: BaseFigurine id: ToyFigurineNukie @@ -200,6 +353,15 @@ #Nonhuman Figurines +- type: entity + parent: BaseFigurine + id: ToyFigurineSpaceDragon + name: space dragon figure + description: A large figurine depicting a space dragon, its red eyes on gazing on its prey. + components: + - type: Sprite + state: spacedragon + - type: entity parent: BaseFigurine id: ToyFigurineQueen @@ -208,7 +370,34 @@ components: - type: Sprite state: queen - + +- type: entity + parent: BaseFigurine + id: ToyFigurineRatKing + name: rat king figure + description: A large figurine depicting a rat king, prepared to make its nest. + components: + - type: Sprite + state: ratking + +- type: entity + parent: BaseFigurine + id: ToyFigurineRatServant + name: rat servant figure + description: A figurine depicting a rat serving the king of rats! + components: + - type: Sprite + state: ratservant + +- type: entity + parent: BaseFigurine + id: ToyFigurineMouse + name: mouse figure + description: A figurine depicting a mouse scuttling away to the nearest piece of food. + components: + - type: Sprite + state: mouse + - type: entity parent: BaseFigurine id: ToyFigurineSlime @@ -218,6 +407,15 @@ - type: Sprite state: slime +- type: entity + parent: BaseFigurine + id: ToyFigurineHamlet + name: hamlet figure + description: A figurine depicting Hamlet, microwave not included. + components: + - type: Sprite + state: hamlet + #TODO: Convert these to the new figurine sprite template and rename their sprite name. #Yes, these are humanoids, but they need to be updated first. diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/bartender.png b/Resources/Textures/Objects/Fun/figurines.rsi/bartender.png new file mode 100644 index 0000000000..10fb686536 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/bartender.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/botanist.png b/Resources/Textures/Objects/Fun/figurines.rsi/botanist.png new file mode 100644 index 0000000000..7c8b8510a1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/botanist.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/boxer.png b/Resources/Textures/Objects/Fun/figurines.rsi/boxer.png new file mode 100644 index 0000000000..528f3a9ff3 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/boxer.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/ce.png b/Resources/Textures/Objects/Fun/figurines.rsi/ce.png new file mode 100644 index 0000000000..116e6ac874 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/ce.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/chaplain.png b/Resources/Textures/Objects/Fun/figurines.rsi/chaplain.png new file mode 100644 index 0000000000..2620502aae Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/chaplain.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/chef.png b/Resources/Textures/Objects/Fun/figurines.rsi/chef.png new file mode 100644 index 0000000000..cf8ba027aa Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/chef.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/chemist.png b/Resources/Textures/Objects/Fun/figurines.rsi/chemist.png new file mode 100644 index 0000000000..8a6984866f Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/chemist.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/cmo.png b/Resources/Textures/Objects/Fun/figurines.rsi/cmo.png new file mode 100644 index 0000000000..a85775eac6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/cmo.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/detective.png b/Resources/Textures/Objects/Fun/figurines.rsi/detective.png new file mode 100644 index 0000000000..69ad733d32 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/detective.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/hamlet.png b/Resources/Textures/Objects/Fun/figurines.rsi/hamlet.png new file mode 100644 index 0000000000..60f0c2aa9a Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/hamlet.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/hop.png b/Resources/Textures/Objects/Fun/figurines.rsi/hop.png new file mode 100644 index 0000000000..eba639ae2a Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/hop.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/hos.png b/Resources/Textures/Objects/Fun/figurines.rsi/hos.png new file mode 100644 index 0000000000..0433ce4597 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/hos.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/janitor.png b/Resources/Textures/Objects/Fun/figurines.rsi/janitor.png new file mode 100644 index 0000000000..ccad46e3a8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/janitor.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/lawyer.png b/Resources/Textures/Objects/Fun/figurines.rsi/lawyer.png new file mode 100644 index 0000000000..9840480a05 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/lawyer.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json index d7560893c7..ab656e28a3 100644 --- a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json @@ -1,95 +1,161 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37", + "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller.", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "atmos" - }, - { - "name": "engineer" - }, - { - "name": "passenger" - }, - { - "name": "passenger_greytide" - }, - { - "name": "captain" - }, - { - "name": "cargotech" - }, - { - "name": "qm" - }, - { - "name": "salvage" - }, - { - "name": "nukie" - }, - { - "name": "nukie_elite" - }, - { - "name": "nukie_commander" - }, - { - "name": "footsoldier" - }, - { - "name": "scientist" - }, - { - "name": "medical" - }, - { - "name": "queen" - }, - { - "name": "security" - }, - { - "name": "clown" - }, - { - "name": "mime" - }, - { - "name": "librarian" - }, - { - "name": "slime" - }, - { - "name": "wizard" - }, - { - "name": "wizard_fake" - }, - { - "name": "owlprize" - }, - { - "name": "griffinprize" - }, - { - "name": "skeletonprize" - }, - { - "name": "fig_box" - }, - { - "name": "fig_box_unfolded" - }, - { - "name": "figurine_spawner" - } - ] + "states": [ + { + "name": "ce" + }, + { + "name": "atmos" + }, + { + "name": "engineer" + }, + { + "name": "passenger" + }, + { + "name": "passenger_greytide" + }, + { + "name": "captain" + }, + { + "name": "cargotech" + }, + { + "name": "qm" + }, + { + "name": "salvage" + }, + { + "name": "nukie" + }, + { + "name": "nukie_elite" + }, + { + "name": "nukie_commander" + }, + { + "name": "footsoldier" + }, + { + "name": "rd" + }, + { + "name": "scientist" + }, + { + "name": "cmo" + }, + { + "name": "chemist" + }, + { + "name": "paramedic" + }, + { + "name": "medical" + }, + { + "name": "hos" + }, + { + "name": "warden" + }, + { + "name": "detective" + }, + { + "name": "security" + }, + { + "name": "lawyer" + }, + { + "name": "hop" + }, + { + "name": "clown" + }, + { + "name": "mime" + }, + { + "name": "musician" + }, + { + "name": "boxer" + }, + { + "name": "librarian" + }, + { + "name": "chaplain" + }, + { + "name": "chef" + }, + { + "name": "bartender" + }, + { + "name": "botanist" + }, + { + "name": "janitor" + }, + { + "name": "spacedragon" + }, + { + "name": "queen" + }, + { + "name": "ratking" + }, + { + "name": "ratservant" + }, + { + "name": "mouse" + }, + { + "name": "slime" + }, + { + "name": "hamlet" + }, + { + "name": "wizard" + }, + { + "name": "wizard_fake" + }, + { + "name": "owlprize" + }, + { + "name": "griffinprize" + }, + { + "name": "skeletonprize" + }, + { + "name": "fig_box" + }, + { + "name": "fig_box_unfolded" + }, + { + "name": "figurine_spawner" + } + ] } diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/mouse.png b/Resources/Textures/Objects/Fun/figurines.rsi/mouse.png new file mode 100644 index 0000000000..76327783ce Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/mouse.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/musician.png b/Resources/Textures/Objects/Fun/figurines.rsi/musician.png new file mode 100644 index 0000000000..8afddefafa Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/musician.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/paramedic.png b/Resources/Textures/Objects/Fun/figurines.rsi/paramedic.png new file mode 100644 index 0000000000..1bd92aa754 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/paramedic.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/ratking.png b/Resources/Textures/Objects/Fun/figurines.rsi/ratking.png new file mode 100644 index 0000000000..1415b72ba9 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/ratking.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/ratservant.png b/Resources/Textures/Objects/Fun/figurines.rsi/ratservant.png new file mode 100644 index 0000000000..90451dca91 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/ratservant.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/rd.png b/Resources/Textures/Objects/Fun/figurines.rsi/rd.png new file mode 100644 index 0000000000..5701fb079b Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/rd.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/spacedragon.png b/Resources/Textures/Objects/Fun/figurines.rsi/spacedragon.png new file mode 100644 index 0000000000..f35ae4b59c Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/spacedragon.png differ diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/warden.png b/Resources/Textures/Objects/Fun/figurines.rsi/warden.png new file mode 100644 index 0000000000..bd09886068 Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/warden.png differ