Commit Graph

8149 Commits

Author SHA1 Message Date
Ed
01f97a8aaa +3 berets (#306) 2024-07-05 08:56:38 +03:00
Ed
d9fc93e0c5 +2 lobby track (#304) 2024-07-04 23:35:53 +03:00
Ed
3182447fbf Grass update v2 (#303)
* high bush

* update worldgen
2024-07-04 23:25:22 +03:00
Ed
9280ca8830 Merge pull request #301 from crystallpunk-14/ed-05-07-2024-upstream
Upstream sync
2024-07-04 19:46:27 +03:00
Jaraten
a9cb687899 resprite decals (#302) 2024-07-04 19:45:24 +03:00
Ed
b1a2aaf1f5 remove vox 2024-07-04 18:25:23 +03:00
Ed
bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml
2024-07-04 18:14:21 +03:00
Ed
38cd8ad6a1 Fix Vox clothing in character creation menu (#29709)
Update vox.yml
2024-07-04 22:55:00 +10:00
JIPDawg
1471bd5b53 Added Health Analyzer to basic treatment module. (#29696)
Removed dropped, added Health Analyzer to Basic Treatment Module

Co-authored-by: JIP <jipdawg93@gmail.com>
2024-07-04 17:17:47 +10:00
metalgearsloth
2988ac3839 Make vox roundstart (#29704)
* Make vox roundstart

I believe all the issues are fixed.

* Click detection bandaid
2024-07-04 17:11:01 +10:00
Nemanja
3e3e050aaf Make all nukies humans (#29693) 2024-07-04 12:29:26 +10:00
Errant
223ade9b3f Starting gear for vox crewmembers (#29685)
* tank harness

* weh

* Suit Storage Whitelist

* Revert "Suit Storage Whitelist"

This reverts commit b1f503573c2936642a2d7627c4852153ec71ce79.

* suit storage filter

* vox spawn gear

* weh
2024-07-04 12:01:03 +10:00
Plykiya
62fcb6bd96 Makes portable flashers destructable (#29564)
Makes portable flashers destructible

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-04 11:51:46 +10:00
Interrobang01
5198c87597 improved wrench description (#29700)
Lefty latchy, righty removey
2024-07-03 20:43:42 -04:00
ArkiveDev
54c659f4aa Allow construction of rotated railings (#29687)
* Remove southRotation from railing structures

* Curly Braces
2024-07-03 12:59:29 -04:00
Ed
a981f99b06 New anomaly behaviour: Invisibility (#29120)
* invisible anomaly

* good luck
2024-07-03 11:14:39 -04:00
metalgearsloth
a2f99cc69e VGRoid support (#27659)
* Dungeon spawn support for grid spawns

* Recursive dungeons working

* Mask approach working

* zack

* More work

* Fix recursive dungeons

* Heap of work

* weh

* the cud

* rar

* Job

* weh

* weh

* weh

* Master merges

* orch

* weh

* vgroid most of the work

* Tweaks

* Tweaks

* weh

* do do do do do do

* Basic layout

* Ore spawning working

* Big breaking changes

* Mob gen working

* weh

* Finalising

* emo

* More finalising

* reverty

* Reduce distance
2024-07-03 22:23:11 +10:00
eoineoineoin
a05d05088e Make artifact analyzer obey laws of physics (#28117) 2024-07-03 01:27:33 -04:00
nikthechampiongr
7defc4b87d Nerf the elite hardsuit (#29429) 2024-07-03 10:31:38 +10:00
Ed
074ec3e17d Goblin species (#295)
* Create CP14HandDisplacementMapComponent.cs

* idk if it works, we need goblin first

* some clean up

* add goblin species sprites

* basic goblic species prototype

* hairs, ears

* typo

* hand displacement maps

* shoes displacement

* shirt displacement

* head displacement. Add support different size maps

* +dummy

* eyes displacement

* pants displacement

* gloves displacements

* cloak and mask displacement (final)

* belt displacement!

* add nose customization

* +2 ears customization
2024-07-03 01:09:57 +03:00
Token
b0ceeb19c3 fix CP14IronGrilleGate sound to chainy metall sound collection (#293) 2024-07-02 23:21:43 +03:00
Mervill
4ec15c84fa Clean up gas miners (#29657)
Separate the environment check from CapSpawnAmount into GetValidEnvironment to make the code a little cleaner, and also makes these two checks independent.

CapSpawnAmount and GetValidEnvironment now both have zero side-effects

Broken renamed Idle to reflect its use. Broken in my mind implies that there's some method for fixing.

---------

Co-authored-by: Partmedia <kevinz5000@gmail.com>
2024-07-02 12:18:56 -08:00
Ko4ergaPunk
59ce9e6dc7 pipetka) (#29667) 2024-07-02 18:28:49 +03:00
Brandon Hu
95f76efd80 fix(greenshift): remove meteors from greenshift (#29271) 2024-07-02 09:51:25 -04:00
lzk
c0a1e6ea15 space law book (#29392)
* Space Law Book

* crate
2024-07-02 09:33:48 -04:00
Cojoke
fe7dbb42b3 Allow Flares to light cigarettes (#29476)
* Allow Flares to light cigarettes

* !IsHot check

* nicer looking(and I think the right way to do that...)

* heh, whoops

* Adds IgnitionEvent, IgnitionSource now functions as IsHot when Ignited

* Fixes + remove redundancy

* Hows this?

* press enter

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Flare is not forever hot anymore

* Formatting fixes

* Make IgnitionEvent readonly

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-07-01 14:14:38 -07:00
metalgearsloth
b6cf2ce524 Add FTL arrival visuals (#29402)
* Add FTL arrival visuals

* weh

* Update Content.Shared/Shuttles/Components/FTLComponent.cs

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

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-07-01 16:11:30 +10:00
TurboTracker
4039488654 comment out Exterminator reference in Ion Laws (#29628)
1984'ed via pull/26978 but was likely missed.
2024-06-30 23:01:53 -04:00
Hmeister-real
7140d01336 CE hardsuit is fireproof again (#29516)
* helm fireproofing

* suit fireproofing

* Update hardsuit-helmets.yml

* Update hardsuits.yml
2024-06-30 10:56:31 -07:00
Nemanja
162913ccd0 Selectable Bar Signs (#29068)
* make bar sign selectable

* ajcm strongest soldier

* AJCM comes down hard for round 2

* good shit

* ok ballin

* bless'ed be the webedit
2024-07-01 02:20:57 +10:00
deltanedas
379013a5da show sleeper agents in round end summary (#29468)
fix sleeper agents not showing in summary

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-30 09:51:33 -04:00
~DreamlyJack~
881f3e4255 New Color Dress (#29473)
* add dress

* add dress

* add dress

* add dress

* add dress

* add dress

* add dress

* add dress

* add dress yml

* add dress in dresser
2024-06-30 09:49:35 -04:00
metalgearsloth
ab268b6e77 Make accentless cost 2 points (#29603)
Not an easy way to do this so if someone wants the default to be better be my guest.
2024-06-30 09:47:22 -04:00
Plykiya
7e2157fbed Borgs can no longer be freely locked/unlocked when emagged (#29605)
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-30 09:46:45 -04:00
Plykiya
fb1740f208 Give skeletons flash immunity (#29604)
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-30 23:42:40 +10:00
Plykiya
c8bb4e961c Change the price of traitor reinforcements to 14, nukie reinforcements to 35 (#29557)
Prices traitor reinforcements to 14, nukie reinforcements to 35

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-30 22:28:00 +10:00
Ed
7e6be7feac fix lava + affectTemp reagent effect 2024-06-30 11:49:51 +03:00
Ed
dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream
# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml
2024-06-30 11:18:30 +03:00
MureixloI
fef679846c Fix some job's drobes point light (#29590)
* Fix some job's drobes point light

* Fix some job's drobes point light
2024-06-30 13:46:31 +10:00
SlamBamActionman
b9fa941ca6 Turn ReagentEffects into generic EntityEffects (#28168)
* Oh the possibilities

* Merge fixes

* Forgot to remote LavaSystem oops

* Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs

* Throw exception for unimplemented effectargs

* Remove Json and overrideable datafields

* Fix test issues

* Actually fix the compiling issue

* Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)
2024-06-30 13:43:43 +10:00
Pieter-Jan Briers
2a7bdd9b08 Revert "plutonium core steal objective" (#29578)
Revert "plutonium core steal objective (#26786)"

This reverts commit f6ce07289a.
2024-06-30 01:23:03 +10:00
slarticodefast
cd2968d849 Add sprite for vent under-pressure lock-out (#29527) 2024-06-28 22:02:48 -07:00
deltanedas
f6ce07289a plutonium core steal objective (#26786)
* add textures

* add SealingCabinet system

* add StoreUnlocker/ObjectiveUnlock system

* add plutonium core and nuke core container

* make nuke deconstructable

* add steal core objective

* add core extraction toolbox to new category

* typo ops wrench fuel

* use queries and resolve, have it resolve instead of using Comp

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-29 14:11:31 +10:00
Token
f7e92980ab Mechs now destructable (#29338)
Add Destructible component to BaseMech
So all mechs are destructable now
2024-06-29 13:28:46 +10:00
T-Stalker
692a6067e9 Remove rads from bananium (#29545)
webedit ops
2024-06-28 19:28:27 -04:00
Guillaume E
c38859b77a Make miners respect AtmosDeviceUpdateEvent.dt (#29522)
Miners' prototype have been changed to reflect this (I read
somewhere that we have about 1 atmos tick/0.5s, my tests show more
like 1/0.53 but that looks close enough).

This also means that miner's spawnAmount is now expressed in mol/s.

See: #18781
2024-06-28 10:49:39 -08:00
Pieter-Jan Briers
6409004244 WATTAGE IS NOT A UNIT OF STORED ENERGY (#29538) 2024-06-28 17:00:45 +02:00
slarticodefast
418fc79698 Give passive vents the correct sprite (#29536)
give passive vents the correct sprite
2024-06-28 08:33:03 -04:00
Ed
1dbe308527 Entity ru localization sync (#285)
* first use

* LOCALIZAAATION

* and again

* Update fire.yml

* Update entities.ftl

* Update main.py

* Update main.py

* delete wrong locales

* battle staff locale

* Update main.py

* more remove

* Update wielded-inhand-right.png
2024-06-28 12:25:20 +03:00
JIPDawg
bb50087dd0 Fixed the sound of pulling back a foam crossbow from a flash sound to a bow pull sound. (#29508)
Fixed foam Crossbow making a flash sound to just a bow pull sound

Co-authored-by: JIP <jipdawg93@gmail.com>
2024-06-27 20:23:17 -04:00