Commit graph

109 commits

Author SHA1 Message Date
VigersRay
aa38c32b65 upstream 2024-09-16 12:40:23 +03:00
xprospero
aa6d5f9573
Rubber chicken toy (#29637)
* -added rubber chicken toy

* -Removed faulty SolutionContainerManager type

-Replaced default toy squeak sound with rubber chicken sound for on-trigger and on-collide.

* fixed raw material cost

* adjusted material composition

* - Added rubber chicken to CrateFunToyBox
- Added rubber chicken to MaintFluffTable under "uncommon group" so that it will spawn in maintenance

* Update Resources/Prototypes/Entities/Objects/Fun/toys.yml

---------

Co-authored-by: gambesun <116504990+gambesun@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-16 01:57:53 +02:00
pacable
c71b0c37b6
Spray paint (#321)
* paints

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* review changes

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-08-28 18:15:38 +03:00
VigersRay
31b2d24e30 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Shared/MagicMirror/MagicMirrorComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
#	Resources/migration.yml
2024-07-31 03:54:09 +03:00
Moomoobeef
7761f86b99
added wearable lizard plushie (#30400) 2024-07-29 15:52:39 +03:00
VigersRay
fe8edf03d4 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
2024-07-15 01:24:12 +03:00
SlamBamActionman
4f479b6c85
Fix RGB toys color when worn/in-hand (#30023)
rgbeeeeeeee
2024-07-14 20:26:34 +10:00
VigersRay
bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Resources/Locale/en-US/chemistry/components/mixing-component.ftl
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/ServerInfo/Guidebook/Mobs/Diona.xml
#	Resources/ServerInfo/Guidebook/Mobs/Species.xml
#	Resources/ServerInfo/Guidebook/Science/Science.xml
#	Resources/ServerInfo/Guidebook/Science/Technologies.xml
#	Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/migration.yml
2024-07-11 14:05:37 +03:00
Boaz1111
d3495fc51c
made the guitars be able to be worn on suitstorage (#29048)
* made the guitars be able to be worn on suitstorage

* minor fix
2024-07-10 09:28:10 +10:00
Ko4ergaPunk
8e7c419eb9 Retexture grass & dirt tiles (#2282)
(cherry picked from commit 26fd08201831ddc20eb413efdbb01a8abed8805f)
2024-06-21 04:34:47 +03:00
VigersRay
b07e5eb660 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-13 09:47:00 +03:00
Moomoobeef
22b1ec9775
added a new sprite for the super synthesizer. (#28884) 2024-06-12 22:20:28 -04:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2)
* commit
2024-05-31 02:16:18 +03:00
lzk
ead78b72d2
Add default whistle + whistles reorganize (#27676)
* Add default whistle + whistle reorganize

* aaa

* fux?

* fiiiiix???

* Revert "fiiiiix???"

This reverts commit 15353465d58db615185afa8c549e1819099c1a5b.

* Apply suggestions from code review

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-05-05 16:42:35 +02:00
metalgearsloth
c91ed96853
Revert Paint (#26593)
* Revert "Fix build (#26258)"

This reverts commit 6de5fbfafb.

* Revert "Spray Paint (Review Ready) (#23003)"

This reverts commit e4d5e7f1ae.

# Conflicts:
#	Resources/Prototypes/Entities/Structures/Holographic/projections.yml
2024-03-31 16:12:52 +11:00
brainfood1183
e4d5e7f1ae
Spray Paint (Review Ready) (#23003)
* Spray Paint (Draft)

* paint colors, paints in maints loot, cargo crate of paints.

* fix

* remove paint (sort of)

* moved paintcleaner into own system

* Moved paint to server (had to unfortunately)

* doafter now breaks when moving away.

* cant paint mobstatecomp

* loads of fixes

* fixes

* fixes

* nopaintshadercomp

* fixes

* fix

* use locale for paint remove string

* remove nopaintshadercomponent and use blacklist

* remove enabled.true from visualizer

* paint doafter event.

* add verbs for paint and remove paint and icon for paint verb.

* fixes

* no longer replaces shader when shader exists.

* replace forloop with foreach, check shader before adding and removing.

* paint doafter now separate so no copy paste code

* Entities in sprayed targets item slots are also now correctly sprayed.

* fix

* fix

* fix airlock psray painter now removes painted before painting door.

* spray paints now use openablecomponent.

* fix

* fix damn accesstypes.

* fix

* fix
2024-03-18 15:29:48 -06:00
deltanedas
f8305a26a9
add more carp plushies (#26081)
* carp plushie textures

* add the plushies

* add plushies to spawners

* rainbow carp and make special plushies rarer

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-15 13:58:17 +11:00
MACMAN2003
0536ce6f95
add NanoTrasen balloon (#25543)
nt balloon

surprised one didn't exist already
2024-02-26 16:15:53 -07:00
Tayrtahn
41cf3e5599
Add open/closed/fill states and sprites (#24600)
This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah.

As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately.
2024-02-04 12:13:47 -08:00
lzk
628e22ba02
Newton cradle (#22914)
* comit

* comit2

* little more range

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-02-01 22:41:19 +11:00
PixelTK
08a31eae19
New sprite for the arachnid plushie. (#24747)
* New sprite

* Contrast is key.
2024-02-01 17:36:43 +11:00
Ubaser
9968cc178b
Golden honker glow (#24230)
add
2024-01-18 10:26:28 -05:00
lzk
a97eb8dcdc
fix plushie rouny sprite (#24031) 2024-01-13 20:20:56 +03:00
Fahasor
fa3da1ab82
Whistle for security (second try) (#23945)
* Move Exclamation entity

* Add Whistle Component and Whistle System

* Add BaseWhistle prototype

* Add sound to BaseWhistle

* Add SecurityWhistle prototype

* Add Sprite and Icon to SecurityWhistle

* Add whistleExclamation prototype

* Fix SecurityWhistle prototype

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* Add whistles to sec vendingMachine

* Revert "Add sound to BaseWhistle"

This reverts commit 0c2eeab1286fb778ed7a845e59c642f667582a4a.

* Add sounds for BaseWhistle

* Make atributions compact

* Remove unnecessary spaces

* Make WhistleSystem class sealed

* Remove possibility to exclamate one person from WhistleComponent

* Remove delay from WhistleSystem

Increase delay

* Remove unnecessary HashSet

* Try replace Resolve

* Refactor sound emmiting

* Rework spawn of exclamation

* Move WhistleComponent from Server to Shared

* Edit WhistleComponent because of moving

* Move WhistleSystem from Server to Client

* Edit WhistleSystem because of moving

* Add new event

* Add server part of WhistleSystem

* Modify system for prediction

* Add documentation to WhistleComponent

* Revert "Modify system for prediction"

This reverts commit 89abb290571ff47deb5491b0f720f6bde079110b.

* Revert "Add server part of WhistleSystem"

This reverts commit ca52ca081f30fb164f401c1818d08531f02af284.

* Revert "Add new event"

This reverts commit 5ca9694757c94c03ca72d5b2f56f5f23503a3263.

* Move system from client to shared

* Modify whistle system because of moving

* Separate checks and action

* Organize file folders according to conventions

* Make component Networked

* Change trigger component for WhistleSystem

* Put indents betwen methods

* Rework WhistleExclamation prototype

* Change variable name

* Add serializer to WhistleComponent

* Rename one variable

* add predict possibility to Shared

* add Client part of prediction

* Add Server part of prediction

* Increase whistle distance

* Prevent spawn for invisible entities

* WhistleComponent now use file-scoped namespace

* Delete unnecessary part from MakeLoudWhistle

* Add Resolve check

* Delete Server and Client part for prediction

* Make system prediction properly

* Change prediction behaviour

* Fix unexpected error occured

* Avoid using obsolete methods

* Add comments

* Update DataField to make it shorter

* Update size for new size system

* Prevent ping for invisible entities for real now

* Avoid triggering unnecessary debug asserts

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-01-12 01:05:28 -07:00
Justin Pfeifler
26c1a78186
Update Blood Red Phone Sprite (#23964)
* Add new phone sprite

* Update copyright attribution
2024-01-12 00:42:49 -07:00
Mr. 27
7947b4e599
Arachnid plushie (#23504) 2024-01-04 15:58:40 -08:00
Ed
1c5639be75
Human plushie (#23518)
* AAAAAAAAA

* TBoI reference

* really remove from cargo crate. redescription

* pipi
2024-01-04 05:27:40 -07:00
Tayrtahn
8ad0d26015
Change range of 10-sided dice (#22833)
* d10s now roll values from 0 to 9

* Changelog for PR #22406 (#22824)

* Remove meta entry for 10 value state

* Gotta delete the 10 face state or the RSI validator complains

* Attempting to fix invalid state causing tests to fail

* Another, better attempt to fix the test

* Once again

* I am an overcomplicating dingbat

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2023-12-21 19:53:17 -07:00
RiceMar1244
5ee01ce900
Resprites energy sword and double energy sword (#22797)
* Removes old inhand visuals from e_sword.rsi and its meta.json

* Adds new visuals with a longer blade for the e sword

* Makes e sword use its new sprites and modifies other energy weapons prototypes to keep using their own inhands

* Makes the toy sword use the old less scary e sword sprites (and gives it BaseItem parent because I thought I broke something when i couldnt pick it up)

* Removes old desword sprites and modifies meta.json

* Temporarily removes esword blade sprites

* Adds back esword sprites after modifying them to flash instead of shimmer

* Adds new desword inhand sprites and modifies meta.json and entity prototype to use them

* Moves desword sprites back to its own folder from inhands_64x after a supposed prefix conflict

* Removes blade inhands

* Adds back blade inhands

* Moves all inhand sprites to their own inhand folders related to the items. Removes inhands_64x folder
2023-12-20 23:32:11 -07:00
Ubaser
57c6e503d1
Crayon boxes get white crayons (#22553) 2023-12-15 19:20:39 -08:00
deltanedas
81b4276b0a
blood-red phone (#22538)
* add blood-red phone

* add to nukie planet

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 04:59:10 -07:00
Ed
0a8a6693a8
add content (#22518) 2023-12-15 02:55:57 -07:00
IProduceWidgets
6ab7ecdd53
Instruments, plushies, gunpet, and bibles. (#22398)
* Some instrument sizes and gunpet sidearm

* Cello

* bagpipe

* Crippling balance PR made bananium horn Small not Tiny

* plushie and toy sizes.

* Scroll bigger

* Make bible same size as other books.

* size rgb staff to other staffs.

* add sprite update json
2023-12-12 01:03:47 -07:00
Ed
c99e265435
Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551)
* add some stuff

* finish pack

* Update encryption_keys.yml

* revert secret channels

* revert spy key

* add spy crew monitor

* add invisible crate

* add void cloak
2023-11-12 16:41:45 -07:00
CMDR-Piboy314
5a5e39f47d
Added a penguin plushie! (#21097) 2023-11-03 22:07:16 -07:00
Bixkitts
74f1098008
Candy Bucket for Halloween (#21257)
* Added candy bucket and component to update appearance of held containers akin to it

* cleanup newline

* newline was load-bearing

* moved component to Shared, cleanup

* newline is spooky

* You build and run without errors, stop pretending otherwise

* Updated for new storage system in master branch
2023-10-31 11:54:41 -04:00
Ubaser
d08a9e2b94
Wearable bee plush (#20623)
* add

* fix

* temporary change, needs fixing

* mayb fix

* actually fix FR

* yes
2023-10-28 20:55:15 -07:00
Doru991
6b04aaf964
Potato battery update + potato AI (#21142)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-10-26 00:52:49 +11:00
Ed
9bb62181de
Added fun: Darts (#20582)
* add textures

* fix cargo/cargo-fun.ftl

* fix cargo/cargo-fun.ftl again

* update icons and resize hitbox

* really fixed cargo.ftl

* fix soundSpecifier

* balance changes: solution transfer has been reduced from 2 to 1. Now the transfer does not work on targets wearing anything in the outerclothing slot

* add hypodart to uplink

* return of darts solution capacity to 2u

* Update uplink-catalog.ftl

* Update uplink_catalog.yml

* Update darts.yml

* remove hypodart sprite

* Update darts.yml

* Update fun.yml

* add random popups component, resprite dartboard

* localize darts

* fix

* Update darts.yml
2023-10-18 23:55:30 -04:00
Psychpsyo
11972a0066
Make Shark Plush Janitor-Bucketable (#20123) 2023-09-14 00:17:44 -07:00
Fromoriss
b50e5651a1
Add moth plushie (#19828)
* Add moth plushie

Moth plushie. It's cute, don't mind, merge it.

* Update toys.yml
2023-09-04 13:18:03 -07:00
/ʊniɹɑː/
b52b063d6f
refactor checkerboard (#18359) 2023-09-03 16:16:09 +10:00
brainfood1183
ae5dcbabee
Holoclown (clown only) syndicate uplink item. (#18966)
* Holoclown (clown only) syndicate uplink item.

* added clumsy to holoclown

* holoclown now uses clown names, holoclown kits box now counts as boxhugs for crafting.

* gibs holoparasite on death if has hands (this will cause the items in hands and pockets to drop.
2023-08-13 01:18:09 -06:00
crazybrain23
ba9f2bd512
Add syndicate pAI to uplink (#18674) 2023-08-05 14:26:25 +10:00
crazybrain23
3cbaf80e38
Syndicate pAI for Nukies (#18625)
* prototype

* Textures

* fix

* spawn

* Implement requested changes

---------

Co-authored-by: fedKotikeD <123323327+fedKotikeD@users.noreply.github.com>
2023-08-03 14:48:40 -06:00
RiceMar1244
11c499039a
Back-Equippable Guitars (#18383)
* added back equip sprites for guitars that didnt have them

* Corrected meta.json copyright fields
2023-07-27 17:05:32 -06:00
DerbyX
6a9dfac3a2
New Figurines (#18198)
* New Types Of Figurines

* Rerun

* Forgot to add Paramedic to toy.yml

* Forgot to add credit in meta

---------

Co-authored-by: Derby <Derby@ss14>
2023-07-23 21:06:07 -06:00
eclips_e
01a0e2002a
Librarian gameplay (DND, but in SS14) (#17041)
* D&D character sheets

* Tabletop improvements

* Grass battlemap

* You can now put shit inside of the board

* change variable name

* make the grass tabletop better, again

* update the damn thing AGAIN

* update the shit AGAIN

* You can now take stuff out of tabletops

* Make it use parenting to avoid zany bugs

* MORE battlemaps! Battlemaps for everyone!

* You can now dump out pieces + cleanup

* All (most) non-game pieces should fall to the ground

* make the verb a bit more responsive

* Librarian content officially done

* fix tests i think

* i forgot the sheet

* Smidgen of refactoring

* You can no longer put high risk items inside of boards

* no boardgame defusal

* minor refactoring

* hoplogrma

* doc

* fix rt
2023-07-17 03:03:18 -06:00
Flareguy
9a32e4d06a
Collectible figurines! (#17993)
* adds spacemen figurines

* dode dode dode

* dodeulation

* you know what they say

* bunger

* bunger bunger bunger bunger bunger
2023-07-16 01:07:47 -06:00
Slava0135
aadcc48ddc
Better glue (#17381) 2023-06-30 15:07:44 -04:00