Morb0
b1550d7db0
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
2023-09-05 00:12:02 +03: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
Morb0
83dcb2970d
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
2023-08-14 03:22:26 +03: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
Morb0
4b873cf1cd
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Textures/Tiles/plating.png
2023-08-06 06:33:32 +03:00
crazybrain23
ba9f2bd512
Add syndicate pAI to uplink ( #18674 )
2023-08-05 14:26:25 +10:00
Morb0
1f35458078
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Player/diona.yml
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/dark_plastic.png
# Resources/Textures/Tiles/plastic.png
# Resources/Textures/Tiles/steel_dirty.png
# Resources/Textures/Tiles/white_plastic.png
2023-08-05 05:10:09 +03: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
Morb0
dda8422a81
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png
2023-07-28 23:30:47 +03: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
Morb0
23eef7660d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-07-28 01:02:37 +03: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
faint
5828dca50b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cent.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-iaa.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png
2023-07-21 16:32:31 +03: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
Morb0
a4dbefd3f1
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Procedural/salvage_rewards.yml
2023-07-01 01:51:55 +03:00
Slava0135
aadcc48ddc
Better glue ( #17381 )
2023-06-30 15:07:44 -04:00
LankLTE
b10a7da5d8
Guitar Smashing ( #17724 )
2023-06-29 15:27:08 -04:00
faint
44dbc63ebc
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/DNA.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png
2023-06-26 17:34:49 +03:00
lzk
309fa1af70
Add beachball and basketball tweaks ( #17285 )
...
* comit
* fix comit
* Update meta.json
* Update SpaceVillainArcadeComponent.cs
* aaa
* updatey
* update desc
2023-06-25 22:07:01 -04:00
Morb0
636bea81df
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
# Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-06-19 21:06:28 +03:00
lzk
b31c848418
[Sprites] guitar back and some resprites ( #16611 )
2023-06-15 21:55:06 +10:00
Renlou
e190771d09
Add funny hampter plushie ( #17099 )
2023-06-03 11:50:53 -07:00
brainfood1183
c99585c94f
Toy Box filled with toys (ready for merge) ( #16252 )
2023-06-03 13:31:47 +10:00
Morb0
6d4e9c2b32
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Structures/Power/apc.rsi/apcox-0.png
# Resources/Textures/Structures/Power/apc.rsi/apcox-1.png
# Resources/Textures/Structures/Power/apc.rsi/meta.json
2023-05-09 13:48:44 +03:00
lzk228
f976ca0270
Add xeno plushie ( #16228 )
2023-05-07 15:50:08 -07:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
lzk228
2921204bd9
[Clothing] Hawaiian shirts ( #16043 )
...
* textures&meta
* plush-rouny-fix
* shirts-yml
* add shirts to clothesmate
* fix
* fixes
* bib
2023-05-03 15:47:49 -06:00
Morbo
50c80d2bd2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeComponent.cs
# Resources/Prototypes/Voice/disease_emotes.yml
2023-04-29 14:53:32 +03:00
brainfood1183
2fba2b18ab
Adds Bananium ( #14663 )
2023-04-29 15:38:09 +10:00
lzk228
10e8cc9d26
Update lamp plushie sprite ( #1006 )
2023-04-22 07:06:44 -07:00
Puro
d639b0c002
[Sprite] Toy Mouse is hat!? ( #15425 )
2023-04-15 16:44:00 -06:00
lapatison
cc5c590ece
Adds the clown recorder (Clown fix) ( #15074 )
2023-04-06 20:06:52 -06:00
dontbetank
81a2b29317
plushie ( #14962 )
2023-03-29 17:36:54 -05:00
brainfood1183
c9e70d8ea0
Cluwne smite ( #13367 )
2023-03-06 11:09:24 -08:00
mhamster
d6c4f3118f
Add atmosian plushie ( #14062 )
2023-02-17 13:57:14 -08:00
brainfood1183
6654558046
happy honk meal box dispenser ( #13490 )
2023-01-22 21:08:16 -04:00
Leon Friedrich
2904a368f7
Dice tweaks ( #13514 )
2023-01-21 10:51:26 +11:00
Clon clover
37e2257005
Banana Phone (: ( #13321 )
2023-01-16 10:06:28 -04:00
Pieter-Jan Briers
14f8b4e6d5
Use new validate-rsis for workflow ( #12997 )
...
* Use new validate-rsis for workflow
* A
* Add python deps
* --ignore-installed
* Make it only work on RSI changes again.
* Fix a bunch of RSIs.
2022-12-20 06:31:17 +01:00
Pieter-Jan Briers
b707b788ac
Remove trailing commas from RSIs. ( #12865 )
2022-12-04 22:47:23 +01:00
Willhelm53
a6be9e75dc
Blue Shark Soft Toy! ( #12047 )
2022-10-22 14:58:18 -07:00
Nemanja
7199defdff
among pequeno ( #11115 )
...
* among pequeno
* better colors + fucked up sprites oops
* Update meta.json
* copy*right* and price 3
2022-09-10 19:08:16 -05:00
Nemanja
1470957e7e
Night At The Orchestra [All the Instruments] ( #9364 )
2022-08-08 12:21:54 +10:00
Emisse
fb6586cdc6
Lamp Plushie ( #9118 )
...
* Update meta.json
* Add files via upload
* Update toys.yml
* Update toy.yml
* Update toys.yml
2022-07-10 20:13:16 -05:00
Aerocrux
064e34e9c5
Fix invisible held sprites for capgun ( #9390 )
...
* Fix capgun YAML for held sprites and touch up in-hand sprites
* Remove capgun size to inherit BaseItem size 5
2022-07-05 10:09:54 -07:00
Kara
a3decccd35
Immovable rod ( #8306 )
2022-05-20 19:43:26 -07:00
EmoGarbage404
1488c9a4f2
Brass Instruments ( #7291 )
2022-04-08 14:12:44 -07:00
T-Stalker
07520696fb
Three more plushies ( #6970 )
2022-03-03 11:26:17 +11:00
