Commit Graph

7819 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
6d51ea95a1 Merge remote-tracking branch 'upstream/master' into ed-22-05-2024-upstream 2024-05-22 13:29:42 +03:00
Ed
ede1406128 Artifact portal effect changes (#28200)
Update portal.yml
2024-05-22 00:52:57 -07:00
Jaraten
41c505afa0 New Chests 2024-05-21 18:06:41 +05:00
Killerqu00
79c77635fa sleeper agent appear later into the round and only once (#28160) 2024-05-21 12:16:35 +02: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
Killerqu00
3b61368946 rotate forensic scanner stored sprite (#28162)
rotate forensic scanner
2024-05-20 15:59:07 -04:00
Verm
dce2bfe2b8 Remove extra gear prototype (#28062)
Remove extra prototype
2024-05-20 13:24:15 +02: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
Flesh
c551cafdae Add plant metabolism effects to chemical guidebook (#28038)
* draft one of plant metabolism guidebook

* loc fix?

* add attributes loc

* fix loc syntax

* improved appearance

* last commit was undercooked, my bad

* last commit was still undercooked, my worse

* last commit was even still undercooked, my worst

* Addressed comments?

* Fix newlines

* Hopefully this works

* Cleanup, I think

* 2xs
2024-05-19 17:01:44 -06:00
Nemanja
a30fb2661f Fix magic mirror (#28084)
* Fix magic mirror

* buff magic mirror
2024-05-19 16:35:55 -06:00
Killerqu00
3c4295697a add (un)equip delay for EVA helmets to fix sound spam (#28142)
add equip delay for EVA helmets
2024-05-19 16:23:38 -06:00
Teemu Kauhanen
d5875fd4a1 add WhiteCane recipe (#28146) 2024-05-19 16:22:45 -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
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
Tayrtahn
bad3bb4a89 Random book story generator refactor (#28082)
* Randomized book overhaul

* Fix prototype names

* Improved setting paper content

* Praise Ratvar
2024-05-18 12:20:00 -04:00
Ed
225a05ecdb Nuke spaceshroom ore (#28110)
nuke spaceshroom ore
2024-05-18 12:17:46 -04:00
Ed
8c7f26f860 Overworld biome overhaul (#156)
* decals filter adding

* add planet generation!

* Update biomes_template_grasslands.yml
2024-05-18 18:06:53 +03:00
Tornado Tech
0aa0abb949 New tiefling hue (#155)
* Добавлен отдельный тип цвета кожи для тифлингов

* Немного чистки

* Автоматом поправил, будет мешать при мердже
2024-05-18 17:46:19 +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
lzk
b08f79fb38 Move replacement chance from ReplacementAccentComponent to ReplacementAccentPrototype (#28049)
Move replacement chance to ReplacementAccentPrototype
2024-05-17 19:33:22 +03:00
Ed
a29034a133 tile filter (#153) 2024-05-17 18:16:14 +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
918ba35ccb Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-17-05-2024-upstream 2024-05-17 12:57:04 +03:00
Errant
6c5b84a346 Remove throngler lottery mention from Tips (#28073)
You sit on a throne of lies
2024-05-16 13:53:46 +03:00
EdenTheLiznerd
f3910d3410 Remove The Throngler from Grand Lottery (#28060)
Peace and Quiet
2024-05-15 23:02:58 +02:00
Verm
2be4287193 Fix Shuttle Roles spawning without PDAs and Headsets (#28045)
* Move to starting gear, define a bunch of stuff

* Spacing
2024-05-15 13:30:53 +03:00
Flareguy
3243afbb03 Makes bullet casings destructible by explosions (#27910)
makes casings destructible
2024-05-14 20:23:24 -04:00
Tunguso4ka
9e8920c9aa Renamed old snake_case IDs to PascalCase IDs (#28014)
* Renamed soda_dispenser to SodaDispenser

* oops, wrong time

* oops

* guidebook

* chem_master
2024-05-14 19:57:42 -04:00
lzk
26747be232 Make hotplate and grill anchorable on table (#28026)
Make hotplate and grill anchorable
2024-05-14 19:57:23 -04:00
Nemanja
950adc8fde Revert "Stop Toilets crushing you into walls" (#27994)
Revert "Stop Toilets crushing you into walls (#27778)"

This reverts commit 24e227660a.
2024-05-14 10:29:50 +10:00
lzk
74020abc91 Fix skirts femalemask (#27984)
Fix skirts
2024-05-13 13:25:58 -06:00
Ed
0a449d64d6 Remove station ambient (#149)
* Update audio.yml

* setup ambience rule
2024-05-13 18:56:39 +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
nikthechampiongr
c8b55e5e44 Record deletion (#27883)
* Allow for Station Records interface for aghosts to delete records

* Fix record consoles not working when there are more than 2 crew members.

HOW DID NOONE NOTICE THIS SOONER???

* Stop being unconventional
2024-05-12 17:07:54 +02:00
metalgearsloth
332f54a3ae Lobby refactor + species loadouts support (#27576)
* Vox stuff

* Species loadouts and lobby refactor

The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest.

* a

* Bulk changes

* a

* weh

* Character import / export

* finalise

* woops this stuff too

* Also datafield exporting

* comments

* Review
2024-05-12 09:18:21 +10:00
keronshb
999d044139 Magic Refactor + Wizard Grimoire (#22568)
* Brings over changes from the original magic refactor PR

* Adds Master Spellbook, spellbook categories, WizCoin currency, and locale

* Wiz€oin™

* Adds currency whitelist to Spellbook preset, grants contained actions on action added.

* Adds grant contained action and remove provided action.

* adds a way for actions to be upgraded to the store

* Adds Fireball 3 and fixes action upgrade logic so that it checks if the action can level or if the action can upgrade separately

* Fixes upgrade logic in ActionUpgradeSystem to allow for level ups without an actual upgrade. Fixed action upgrade logic in store system as well

* Removes current action entity from the bought entities list and adds new or old action entity

* Removes Current Entity

* Removes old comments, fixes TransferAllActionsWithNewAttached

* Removes TODO

* Removes Product Action Upgrade Event

* reverts changes to immovablerodrule

* Removes stale event reference

* fixes mind action grant logic

* reverts shared gun system change to projectile anomaly system

* forgor to remove the using

* Reverts unintended changes to action container

* Adds refund button to the store

* Refreshes store back to origin.

* Refund with correct currency

* Init refund

* Check for terminating and update interface

* Disables refund button

* Removes preset allow refund

* dont refund if map changed

* adds refunds to stores

* Adds method to check for starting map

* comments, datafields, some requested changes

* turns event into ref event

* Adds datafields

* Switches to entity terminating event

* Changes store entity to be nullable and checks if store is terminating to remove reference.

* Tryadd instead of containskey

* Adds a refund disable method, disables refund on bought ent container changes if not an action

* Removes duplicate refundcomp

* Removes unintended merges

* Removed another unintended change from merge

* removes extra using statement

* readds using statement

* might as well just remove both usings since it won't leave the PR

* Fixes Action upgrades from stores

* Changes to non obsolete method uses

* Shares spawn code between instant and world

* Adds action entity to action event, adds beforecastspellevent, adds spell requirements to magic component

* puts prereq check in spell methods, sets up template code for before cast event

* checks for required wizard clothes

* Networks Magic Comp and Wizard Clothes Comp. Renames MagicSpawnData to MagicInstantSpawnData.

* Removes posdata from projectiles

* Speech > RequiresSpeech

* Fixes ActionOnInteract

* checks for muted

* popup for missing reqs

* Validate click loc for blink spell

* Checks if doors are in range and not obstructed before opening

* Check ents by map coords

* Adds speak event

* Comments spellbooks

* Removes comments

* Unobsoletes smite spell

* Invert if

* Requirements loc

* Fixes spell reqs

* Inverts an if

* Comment updates

* Starts doafter work

* Removes doafter references

* Balances fireball upgrades to be more reasonable

* Enables refund on master spellbooks

* Spells to do

* update spellbook doafter

* knock toggles bolts

* Touch Spell comments

* Comments for pending spells

* more comments

* adds spider polymorph to spellbook

* TODOs for spells

* reorganizes spellbook categories and adds wands

* fixes spacing and adds limited conditions

* commented owner only for future store PR

* reenables owner only for the grimoire

* fixes grimoire sprite

* Adds wizard rod polymorph

* summon ghosts event

* Moves rod form to offensive category

* Adds charge spell and loc for rod polymorph

* Oops forgor the actual chages

* Item Recall comment

* Fixes UI

* removes extra field for wizard rod

* Cleanup

* New Condition (INCOMPLETE)

* Fix linter

* Fix linter (for real)

* fixed some descriptions

* adds regions to magic

* Adds a non-refund wizard grimoire, fixes blink to deselect after teleporting, reduces force wall despawn time to 12 seconds

* removes limited upgrade condition

---------

Co-authored-by: AJCM <AJCM@tutanota.com>
2024-05-11 19:06:49 -04:00
RiceMar1244
5da04e1cfc Fixes oversight in wieldable smg accuracy (#27907) 2024-05-11 10:40:01 -04:00
Mr. 27
9845d8bd30 Fix ninja suit suit storage and other armor missing their suit storage (#27897)
b
2024-05-10 22:20:18 -04:00
slarticodefast
938c3104e7 Remove THC oil (#27889)
remove THC oil
2024-05-10 19:56:48 -04:00
youtissoum
267d648172 Add slime and spider wideswinging (#27856)
* Add wide swinging to spiders

* Add wide swinging to slimes
2024-05-10 19:49:56 -04:00
IProduceWidgets
40802738ec change shadowstone desc. (#27900)
shadowstone desc.
2024-05-10 13:44:27 -07:00