Commit Graph

2425 Commits

Author SHA1 Message Date
Ed
f8564b3661 Agaric shroom! (#172)
* agaric shrooms!

* add agaric reagents

* add agaric into worldgen
2024-05-25 13:30:33 +03:00
Ed
505a12606a add wallet (#169) 2024-05-24 18:59:10 +03:00
Ed
907b41a4d1 Water floor antity (#168)
* add rivers and lake test generation

* add water animation
2024-05-23 18:35:38 +03:00
Ed
2e91620630 Wall lantern + floor water (PLaceholders) (#167)
* fix lamp sprite

* Update wallmount_torch.yml

* add water test sprite

* add simple water entity

* add reversed crystall sprites

* add sand tile
2024-05-22 23:18:18 +03:00
Ed
8da9910814 Merge pull request #164 from Jaraten/NewChests
New Chests
2024-05-22 22:14:21 +03:00
Ed
327ee24b19 Update meta.json 2024-05-22 22:13:46 +03:00
Ed
5b653eea4f Update meta.json 2024-05-22 22:13:12 +03:00
Ed
6d51ea95a1 Merge remote-tracking branch 'upstream/master' into ed-22-05-2024-upstream 2024-05-22 13:29:42 +03:00
Jaraten
41c505afa0 New Chests 2024-05-21 18:06:41 +05:00
Jaraten
26f91c3a5a resprite tiles (#163) 2024-05-21 15:50:37 +03:00
Jaraten
82013c2be1 Wooden Window Fix (#162) 2024-05-21 11:54:45 +03:00
Ed
18e4e86b21 Ed 19 05 2024 building2 (#161)
* added wooden planks from wooden logs

* update construction crafts from new wood planks

* Update simple.yml

* add wall frame and wall construction graph

* noSpawn old planks, fix wooden frame layering

* update Jaraten sprites

* add wooden window and restruct files

* fix

* Update wall.yml

* add new walls!

* restruct wallmounts, fix bugs

* door fix

* Update walls.yml

* Update simple.yml
2024-05-21 00:07:51 +03:00
TsjipTsjip
daac303783 Admin access configurator (#28107)
* Port spritework and initial prototypes by @Arimah

Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>

* Make Admin PDA's spawn with a universal ID card

* Add universal access configurator to aghost satchel of holding

* Add Admin suffixes to adminonly items: AdminPDA, UniversalIDCard, AccessConfiguratorUniversal

* Admin jobicon

---------

Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>
2024-05-19 17:04:16 -06:00
lzk
e06b58abce Resprite zookeper id (#28131)
Change zookeper id
2024-05-19 16:05:12 -06:00
MilenVolf
c8a72e1aa6 Fix toilet texture & fixture (#28125)
* Fix toilet texture & fixture

Passangers that got stuck between wall and a toilet will thank you

* Fix mask, add layer None
2024-05-19 16:04:55 -06:00
Ed
1dbb4e7e94 Merge branch 'master' into ed-19-05-2024-upstream 2024-05-19 15:57:20 +03:00
Ed
6a639107b3 Merge remote-tracking branch 'space-station-14/master' into ed-19-05-2024-upstream
# Conflicts:
#	Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
2024-05-19 15:43:25 +03:00
Ed
1ce32bd1c7 Logs + fireplace fix + Trees (#158)
* add wooden log stacks

* setup wood material

* update trees

* fix fireplaces

* stack now properly works in fireplace system

* bonfire fix

* Update materials.yml

* Update base.yml
2024-05-19 15:40:28 +03:00
Ed
13d104c0de update ladder color 2024-05-19 00:44:37 +03:00
Ed
b66ce952af Minecraft update (#157)
* add shovel and digging tool quality

* dirt digging effect

* variantize deconstructed tile

* added dirt tile borders

* revert variantize tiles, add dirt blocks entity

* add dirt stack

* Update simple.yml
2024-05-19 00:26:52 +03:00
Ed
9690077532 Bloodgrass gatherable entity + gatherable system cleanup + bugfix (#154)
* added 4 basic reagent effects

* entrance bugfixes

* add bloodgrass world sprites

* preuso cherry pick

* add planet bloodgrass and sickle gathering

* +1 gather sound
2024-05-18 15:16:20 +03:00
lzk
37382b3186 Move pens out of paper.yml mess (#28044)
* Move pens out of paper.yml mess

* forgor

* fix tests

* fux

* fix 2
2024-05-18 12:51:02 +03:00
Ed
811cc8a41d Underworld + Overworld (#151)
* Setup new dungeon system (v2)

* add custom basic generation

* add maps linking

shitcode, boo

* add auto linking sub-world portal

* fix deleted component

* clearing otherside of the tiles manually (im stuck in wall, brother!)

* Upgrade cave biome generation

* add TODO

* add ladder and hole sprites

* add dungeon entrance prototypes

* clean up, add docs

* add many ambient sounds

* Update CP14StationDungeonMapSystem.cs

* remove bugs
2024-05-17 17:07:29 +03:00
Ed
dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream
# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml
2024-05-13 18:32:59 +03:00
Flareguy
8366c743f2 Gives vox The Brows in their front facing sprite (#27922)
* gives vox The Brows in their front facing sprite

* JASON
2024-05-11 10:54:56 -04:00
Mr. 27
9ee42e1138 Fix security jumpsuit sprite's asymmetry (#27925)
* inital

* Update meta.json
2024-05-11 08:52:57 -05:00
ike709
af4c6373f6 Adds Support for Guidebook Buttons in UIs (#27891)
* Adds Support for Guidebook Buttons in UIs

* read it from the component

* the code is perfect

* moony review

---------

Co-authored-by: ike709 <ike709@github.com>
2024-05-10 22:21:18 -04:00
RiceMar1244
2287f59e8a Adds wielding for all large guns (#26970)
* Adds wielding assets

* Modifies meta.json files and adds artist credit

* Adds wieldable component to a bunch of weapons

* Moves shotgun inhands and wield inhands to their own folders (because its the only way the sprites would work)

* Removes the wieldable component from some guns

* Adds wielding sprites for wieldable guns that didnt have them

* Adds gun wielding bonuses and base innaccuracy to wieldable guns.

* Corrects wielded accuracy to be default accuracy instead of perfect

* Makes the drozd smg and bulldog shotgun wieldable

* Makes nukie c20r wieldable and adds sprites

* Adds BaseGunWieldable

* Makes all the newly wieldable gun use the base inheritable

* Adds accuracy to smgs to resolve inheritance conflict

* Makes all wieldable shotguns require wielding to fire because of a bug involving spread innacuracy

* Adds wield bonus message on examine
2024-05-09 19:58:15 -07:00
Hanz
77ee0088f9 CMO Drip DLC (#26153)
* All the stuff

yes yes

* THE GOD DAMN META

bruh

* New sprites and all that jazz

yay

* loadouts working?
2024-05-09 17:53:55 -04:00
lzk
4231efc780 Change minimalist theme empty slot outline (#27860)
Change minimalist them empty slot outline
2024-05-09 17:17:33 -04:00
Mr. 27
74e39fb918 senior security jumpskirt resprite and security jumpskirt sprite minor fix (#27804)
inital
2024-05-09 07:28:28 -05:00
Alzore
4d991d1554 Atmos pipes now deal blunt damage (#27673)
* pipe

* weak

* inhand

* IT WORKS

* inventory
2024-05-08 23:00:47 -07:00
Ed
7b2328ba22 Alchemy tools: pestle and mortar (#144)
* add mortar & pestle mechanic

* setup prototypes

* Update mixing_types.yml

* add bubble sound collection, fix errors
2024-05-08 17:15:31 +03:00
Ed
b92032fdd7 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-08-05-2024-upstream
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/lobbyscreens.yml
2024-05-08 12:26:05 +03:00
Kukutis96513
dd51d0e19e Secoff senior uniform fix (#27775)
* weh.

* get the weh out of my repository

* add best lizard figurine

* remove umbra stuff from master

* remove the additional pixels from the senior secoff jumpskirt sprite

* fix the fix
2024-05-08 08:57:21 +02:00
Flareguy
caa822b9a0 Revert "Make the floppy lizard ears have two colors." (#27790)
Revert "Make the floppy lizard ears have two colors. (#27679)"

This reverts commit bd06aa2365.
2024-05-07 20:48:42 -07:00
pigeonpeas
bd06aa2365 Make the floppy lizard ears have two colors. (#27679)
* Make the floppy lizard ears have two colors.

* please fix whatever the hell happened

* fix the error

* suggestion from Ubaser

* another suggestion from ubaser
2024-05-07 17:22:25 -07:00
OnsenCapy
8ec52ff69c Change combat gloves sprite (#27373)
* Changed combat gloves sprite.

* Edited combat gloves sprite.
2024-05-07 17:19:55 -07:00
Hannah Giovanna Dawson
b90373356e Weapon Reflection Movement Mechanic (#27219)
* Weapon Reflection Movement Mechanic

Adds a movement mechanic to deflection.
Standing still gives you your best chance of deflecting a shot.
Moving lowers this to 2/3rds. Sprinting to 1/3rd.

This allows for robust players to express better and provides
counterplay to someone finding a goober-strong deflection
weapon, giving more design space.

As part of this PR I've also touched the numbers of a few swords,
shields, etc. and modified some descriptions to make them read
better. The balance numbers are not remotely final, but as intent:

1. All the sidearm swords (katana, cutlass, captain's sabre) have the same damage. There's no good reason the "ceremonial" blade the captain has doing more damage than a katana.
2. The Captain's Sabre has a 30% reflect chance, dropping to 20% when moving and 10% when sprinting. This one is controversial due to the recent nerf, I suspect: This could easily be 15->10->5?
3. The Energy Katana has a flat 30% reflect chance.
4. The meme Throngler has a 30% reflect chance, dropping to 20% when moving and 10% when sprinting.
5. The E-Sword has a 30% reflect chance, dropping to 20% when moving and 10% when sprinting.
6. The Double E-Sword has a mighty 75% reflect chance, dropping to 50% and then 25%.
7. Both reflective shields - Mirror and Energy - have a 95% deflect chance, dropping to 63% then 31%.

* Resolve PR comments.

* Weh?

* Reign in double esword a tad

* Shield nerfs no longer real

* Improve Mirror Cult desc

* Simple alert for deflection! No art yet.

* Added a new icon for deflecting
2024-05-07 20:14:58 +02:00
Flareguy
e4a516514f Adds most non-displacement-mappable vox sprites (#27577)
* non-displacement-mappable vox sprites part 2

* fixes

* more fixes

* a

* more para sprites + ntrsa voidhelm

* no more clown...
2024-05-06 23:23:27 -04:00
Ed
547e15a158 hair update (#139) 2024-05-07 01:10:12 +03:00
T-Stalker
026af631f8 New lobby art: Just a week away (#27717)
just a week away
2024-05-06 01:17:35 -07:00
Ty Ashley
b8144df7a5 Added new icons for the emote wheel (#27541)
* Added new icons for the emote wheel

* Corrected weh path

* Changed whistle to better match other vocal emotes. Modified honk icon to match dimensions of box. Corrected chirp and chitter emote icons.

* Cleaned up edges of icons

* Added attributions.yml to emotes folder
2024-05-05 20:12:30 -05:00
Verm
70d3cf7ba4 Emergency Tank + Plasma Can visible on suit storage slot (#27598)
* Suitstorage Sprites + Plasma tank slots

* Fix some extra brackets
2024-05-06 00:42:22 +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
Nim
f411126191 rifle (#134) 2024-05-05 00:43:56 +03:00
Ed
445f08ae07 Merge remote-tracking branch 'space-station-14/master' into 04-05-2024-upstream
# Conflicts:
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/train.yml
2024-05-04 21:13:30 +03:00
Ed
72b8fcf99c Tiles rework (#131)
* tile restruct

* filter tiles

* Update ContentTileDefinition.cs

* oopsie

* Update migration.yml

* Update cave-arena.yml

* floors fix
2024-05-04 16:35:59 +03:00
Flareguy
0e829eb380 Vox customization fixes & updating (#27663)
vox customization
2024-05-04 04:12:11 -07:00
Litogin
1d233226bb Animation of tails (#128)
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-05-04 13:31:14 +03:00