Commit Graph

7142 Commits

Author SHA1 Message Date
Kara
d35e2f39a7 Roundstart variation game rules (#24397)
* Raise `StationPostInitEvent` broadcast

* Basic variation pass handling

* standardize names + rule entities

* why does it work like that?

* add to defaults

* light break variation pass

* ent spawn entry

* move some stationevent utility functions to gamerule + add one for finding random tile on specified station

* forgot how statistics works

* powered light variation pass is good now

* station tile count function

* public method to ensure all solutions (for procedural use before mapinit)

* move gamerulesystem utility funcs to partial

* ensure all solutions before spilling in puddlesystem. for use when spilling before mapinit

* trash & puddle variation passes!

* oh yeah

* ehh lets live a little

* std

* utility for game rule check based on comp

* entprotoid the trash spawner oops

* generalize trash variation

* use added instead of started for secret rule

* random cleanup

* generic replacement variation system

* Wall rusting variation rule

* account for modifying while enumerating

* use localaabb

* fix test

* minor tweaks

* reinforced wall replacer + puddletweaker

(cherry picked from commit cc24ba6a317c4bee84ffa1eda8397c255ca92be9)
2024-02-08 12:03:43 +01:00
themias
1f1c07a622 Allow IdentityBlocker partial coverage (#24741)
* Allow IdentityBlocker partial coverage

* rename to TotalCoverage

(cherry picked from commit d75f6c3db4f638e9a479fe40c8d50f0e6c137556)
2024-02-08 12:02:46 +01:00
Ed
f4c18667a4 Shuttle guns new sounds (#24714)
* new sounds

* fix

* fix sound

* some tweak

(cherry picked from commit 60c5797807af4a48e9971dfd7b36b2a9938ea2db)
2024-02-08 12:01:12 +01:00
Scribbles0
d13859eb2b Orbital Anomaly Cores (#24716)
follow tag + norot

(cherry picked from commit e4763ffecca876a93087d3750dd571693556b81c)
2024-02-08 12:01:05 +01:00
CrigCrag
f4cfa192c3 Overrun Outpost Arm (#24656)
* add every

* remove 2 crusher spawns

(cherry picked from commit 572347af5d1dc7a0a25d5afeafa823ac5ea8ace7)
2024-02-08 11:59:13 +01:00
liltenhead
57e74caf62 Jugs are destructible (#24719)
* destructible jug

* destruction

* Update Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 31f7acf223c40cb7b300b7a87cb7f3c9f08bd817)
2024-02-08 11:57:07 +01:00
SlamBamActionman
df339ce7d1 Add water droplet hat for arachnids (#23822)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
(cherry picked from commit a86d0e51ec74cfdde2969d73bcb1ea1c683911bb)
2024-02-08 11:57:02 +01:00
Hanz
c6d3377853 Drink tastes touchup (#24700)
* Actual tastebuds

yup

* Grape Soda, can't forget them too

Grape Soda, my beloved

(cherry picked from commit 61516e82537877248a033c6988eda7e963cc0992)
2024-02-08 11:57:01 +01:00
Tayrtahn
1cf4508ca7 Add fill level visuals for water bottle in-hand sprites (#24708)
Fill level visuals for water bottle inhands

(cherry picked from commit cebb20d5355ec613d575df20d3a10fae974a2be0)
2024-02-08 11:56:59 +01:00
themias
1c79bc7b4b Add sticky footstep sound to space glue (#24710)
(cherry picked from commit e27a3e0d3e5827cc06a91a11d4b295e6d9d95b7e)
2024-02-08 11:56:41 +01:00
SpeltIncorrectyl
e390fd34bf Adds signal control to portable generators (#24157)
* added signal control to portable generators

* added documentation

* Discard changes to Content.Server/Radio/EntitySystems/HeadsetSystem.cs

* added DeviceNetworkComponent and WirelessNetworkConnectionComponent to generator prototype

* made GeneratorSignalControlComponent nicer

* implemented auto-revving

* added back necessary dependency

* can't send do-after event manually

* repeat now works with auto revving

* fixed

* removed vv

* stopping generating when it is revving now makes it stop revving

* Update Content.Shared/Power/Generator/ActiveGeneratorRevvingComponent.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* used resolve instead of TryComp

---------

Co-authored-by: Julian Giebel <juliangiebel@live.de>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit 5d2ddc0d8b313d80fbcecd6719c5048ec2aea3e7)
2024-02-08 11:56:22 +01:00
EdenTheLiznerd
20055cfb97 Reduce synaptizine damage (#24676)
(cherry picked from commit cf1d3eae155cb9a7ea277a58130e9c292a103d13)
2024-02-08 11:56:16 +01:00
Julian Giebel
d805b82848 Implement basic emoji support (#24039)
* Implement basic font support

Add NotoEmoji font
Add emoji font to default font stacks

* Remove unneded change

* L

* Remove emoji font from default font stacks

(cherry picked from commit 94b43423b4ba3bac3325610a6699a9f6cd08653b)
2024-02-08 11:55:27 +01:00
Vyacheslav Kovalevsky
870cae9db8 Store ninja objectives in conditions 2 (#20894)
* move spider charge target from role

* shorter field names

* remove ninja role comment

* remove unused systems in SpaceNinjaSystem

* GenericAntagObjectivesAddedEvent

* check if warp point is on same map

* remove unnecessary import

* add missing loc when spider charge has no target

* a

* remove spider charge target requirement comp

* inline SpiderChargeTitle

* allow planting charge without objective

* remove map check

* fix role check when planting

* obj.Target

* Fix merge

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 7311ce671fe29d81c662b2313e28c275c4f868cb)
2024-02-08 11:54:40 +01:00
Nemanja
3b3e9abb7b Make procgen use weighted variants (#24669)
(cherry picked from commit 2a6705818bf510aee3026c7f3c3a4ed56f188189)
2024-02-08 11:54:39 +01:00
themias
cd03dbac2b Add inhand fill visuals (#24495)
* Add inhand fill visuals

* oops

* remove unused import

(cherry picked from commit bd100344a2f9f845e2dceb8351d36f8af913a5f1)
2024-02-08 11:54:38 +01:00
Ed
758484e97f Fire anom rework (#24666)
* content

* d

* fix artifact

(cherry picked from commit 3deea2f7d68c05ec415e075328533c6eb1d4f8e6)
2024-02-08 11:52:34 +01:00
metalgearsloth
561a98a20b Anti-anomaly fixes (#24634)
- Remove unnecessary mapcoordinates get.
- Remove mapping markers as everything should be ingame entities and this is functioning as an area.

(cherry picked from commit 11c69bca3f370e3a3fde1bc24976fd1188aebb30)
2024-02-08 11:52:33 +01:00
metalgearsloth
ac052e4666 Revert "Make flare gun explode, damage and stun the player when used … (#24679)
* Revert "Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)"

This reverts commit e301378114b245fa6927372f83c19868cb90b13c.

# Conflicts:
#	Content.Shared/Weapons/Ranged/Components/GunComponent.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

* Fix revert conflicts

* Update Content.Shared/Weapons/Ranged/Components/GunComponent.cs

(cherry picked from commit e1901aa6b602516f0f7cc3f29844c77e90c77977)
2024-02-08 11:52:32 +01:00
Errant
22405349cc Localize preset labels on chem dispenser (#24617)
(cherry picked from commit 556545e324a135e8a4da643a41c94b636d83d946)
2024-02-08 11:52:28 +01:00
Alzore
c0b11e141d Remove salvage flesh ghost roles (#24651)
nomoresentientmeat

(cherry picked from commit 96ffc31b66490ff1882922f66171126de5255415)
2024-02-08 11:52:10 +01:00
deltanedas
1093edc67d Give anomaly borg module a signaller (#24466)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 19a05e11d037fd99c38f4a4a646fd6bf02f3c04c)
2024-02-08 11:51:56 +01:00
shamp
fc3197e13a Added new All at once game preset (#23171)
* Update game_presets.yml

* Create preset-allatonce.ftl

* Update game_presets.yml

* Update game_presets.yml

the game rule has been removed:
- pirates

* Update game_presets.yml

Pascal case/Camel case fix

* Update preset-allatonce.ftl

Camel case fix

(cherry picked from commit 4920d5f7dfe0df8f8e45ec7d6a91cd3514d680c4)
2024-02-08 11:51:00 +01:00
themias
8497ef8002 Add cowboy hats and boots (#24299)
* Add cowboy hats and boots

* oops

* audio fix and attribution

(cherry picked from commit 5c75117749ce959accb936cffd6bc1d481137a13)
2024-02-08 11:50:35 +01:00
metalgearsloth
0f35906014 Steal cleanup (#24428)
- Fix datafield spelling
- Fix some code oddities

(cherry picked from commit b1f9e25c1364064b03bc37357d3453f01e28b8a4)
2024-02-08 11:49:26 +01:00
Pieter-Jan Briers
c2d69f2dd4 Security barriers take 5 seconds to (un)lock (#24637)
People are using these as unhackable and hard-to-tailgate airlocks into sec. They should not be trivial for security officers to move through.

Made LockComponent have configurable lock times to implement this.

(cherry picked from commit 8ca7cb59a3b83e86c9b27a9549bf85a9f914b6fe)
2024-02-08 11:49:24 +01:00
UnicornOnLSD
7c088176cb Submarine update no. I forgot (#783)
* tweaks done put in the PR changelog

* more tweaks, enough for PR, all good.

* fixed solution

* fixed few fucked up station beacons

* FIX: cams, some accesses, more jobs, more lockers, perma prepped.

* brought more jobs slots to service, and borgs

* buncha changes

moved comms, made the hospital a little less prone to maints shenanigans, connected the psychologist offices directly to the main hall, added another exit to urgent care, gave perma a visitation area and moved the brigmedics room, made perma less prone to escapes, turned the cafe into an arcade, turned the rightmost mall kitchen into a laundromat, removed the halloween stuff

* raise pop to fifty

* fix hos safe & cleaned up salv a little

also hid a few aloe and galaxythistle around the maze just to help the caustic issues

* siobhan for epi

* PR commit, merged atmosia update, upgraded comms, fixed a few power issues

* ran important mapping CMDs, yeepee

* merging fuck file

* redone the changes, removed tiny fans, fixed robotics

* fixed solution smh

* added more priso slots

* terminated TEG, put wood corner instead

---------

Co-authored-by: rosieposie <roseknight9999@gmail.com>
2024-02-06 20:32:33 -06:00
Velcroboy
ae155021b5 Moves ruins maps to DV folder and updates with some changes and dangers (#785)
Co-authored-by: Velcroboy <>
2024-02-05 21:11:50 +00:00
Adrian16199
54f4163d6c Quick fix to the fix (#770)
I forgot that harpy's aint suppose to have arm things

WHoops

Thankfully its only the thing that I forgot.
2024-02-03 19:51:02 +01:00
Adrian16199
6906f7504e Fixes Gauze Markings 2 - Medical Boogaloo (#22452) (#768) 2024-02-03 19:14:43 +01:00
Velcroboy
4c7a384058 Re-save and add DV salvage maps (#765)
Co-authored-by: Velcroboy <>
2024-02-03 06:50:10 +00:00
Velcroboy
17c6535d81 Map Edits (#761)
Co-authored-by: Velcroboy <>
2024-02-02 18:54:54 +00:00
Colin-Tel
075915c458 Changes Asterisk's evac shuttle to the NTES Kaeri (#757)
Kaeri, my beloved.
2024-02-01 20:06:26 +00:00
UnicornOnLSD
469bf66aa4 Submarine Station (#704)
* wawa

* A LOT of changes, will write a proper commit

* Final tweaks for Submarine station.

* Finaler tweaks, fixed power on a few places etc etc.

* edits 4 map

* fix sln file

* woopsies, fix !

* removed mediborg from available jobs

* Fixed musician spawn point lacking

* tweaked submarine: fixed evac screens, added material reclaimer in disposals

* submarine update:
-resorted chemistry
-drippy closets up
-THE CRYO IS REAAAAAAL
-beacons, they're here
-stuff

* fixed shuttel, now it's hammurabi's because it's sick and I can't be bothered to build a whole ass evac shuttle meself

* oopsy woopsie wrong file directory uwu

* emergency fixes, weewoo now it's good

* last changes, on god:
-adjusted maints
-new 3R#0!/ beacon somewhere
-AME has enough cores to power station properly roundstart

* fix cryopod, FULLY READY NOW.

* Final commit, changes the shuttle, added perma cryopod, all clean and good to go.

---------

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-02-01 13:30:23 -06:00
OldDanceJacket
cf7fccf889 SlowOnDamage lessened + Moth buff (#741)
* Update base.yml

Signed-off-by: OldDanceJacket <98985560+OldDanceJacket@users.noreply.github.com>

* 4.5 -> 1.5 heat dmg multiplier

Signed-off-by: OldDanceJacket <98985560+OldDanceJacket@users.noreply.github.com>

* Raised speedModifierThresholds

Signed-off-by: OldDanceJacket <98985560+OldDanceJacket@users.noreply.github.com>

* Lowered Heat Dmg by .5

Signed-off-by: OldDanceJacket <98985560+OldDanceJacket@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Species/base.yml

Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
Signed-off-by: OldDanceJacket <98985560+OldDanceJacket@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Species/moth.yml

Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
Signed-off-by: OldDanceJacket <98985560+OldDanceJacket@users.noreply.github.com>

---------

Signed-off-by: OldDanceJacket <98985560+OldDanceJacket@users.noreply.github.com>
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-01 19:34:17 +01:00
Adrian16199
babe5b3bcc Alternative wagging tail for felinids. (#593)
* Alternative wagging tail for felinids.

More options for felinids.

Ported from TG station.

* Deletes that one line that appeard for some reason.

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
2024-02-01 19:32:54 +01:00
leo
4e7e17a39b Glimmer Mite - pest that causes glimmer (#564)
* little glimmer guy

* oops I forgot to add a mob description

HA HA HA

* attempting to fix code issues

* more code fixes

* more code fixes

* cod efix

* coed fics

* every day i scream at least twice

* fixed attribution

* Update attributions.yml

tehe

* made the sound effect public domain

* dies

* bug fix (HA HA)

* wow fuck someone already added ectoplasm wow i thought i added it first wow

wow
2024-02-01 19:32:28 +01:00
Danger Revolution!
0228aba4cc adds new headset sprites for the listening post operatives (#635)
* adds server sprites

* adds headset sprites

* Revert "adds server sprites"

This reverts commit 77aeb26e1c6c004b0e0927c5b8a7ef59ac1c44c3.

* quick little change to the sprite i forgot to add the first time round

* Update alt-equipped-EARS.png

---------

Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
2024-02-01 19:29:24 +01:00
Debug
814446fb36 Remove last remaining way of getting tesla generator (#752)
Update salvage.yml

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-01 00:29:50 +01:00
Debug
2d03cc63b6 Add prisoner latejoin cryopod (#751) 2024-01-31 22:02:05 +00:00
Debug
c463da2e8d Update prisoner.yml (#750)
Yes, its terrible. No, I dont care

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-01-31 21:40:50 +00:00
leo
45735bf860 Nerfing Health Code Violation (#714)
make HCV less immediately lethal but still fun
2024-01-31 11:34:16 +01:00
Velcroboy
3dd7d8a56c Re-add evac shuttles Box & Lox (#737)
Co-authored-by: Velcroboy <>
2024-01-30 21:55:15 +00:00
Tad "Taddy" Johnson
62477426ee Update pride.yml (#733)
* Update pride.yml

Necessary change.

* Update pride.yml

added bee socks. very important

* Update cargo_vending.yml

the price of freedom

Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>

---------

Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
2024-01-30 15:22:13 +01:00
Debug
b84c8287a7 Merge branch 'master' into interior_questionmark
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-01-28 02:24:36 +01:00
Debug
fd28a4853c Merge remote-tracking branch 'upstream/master' into Wizmerge-22/01
# Conflicts:
#	Resources/Maps/hammurabi.yml
2024-01-28 01:27:11 +01:00
Debug
62009ac6bd Fix linter error 2024-01-28 01:19:19 +01:00
FungiFellow
60ff465b01 Ion Storm Weight Increase (#24633)
(cherry picked from commit 7b046aceb8cef4a314682ea7ba374489227f057d)
2024-01-28 00:34:26 +01:00
Hanz
be60ec7f59 Bartender limited reagents fixup (#24598)
Fixed up bartending after the limited reagents update

(cherry picked from commit 8fc9650b6e2cd9dbfb1fd05d731c2fad3e0b8165)
2024-01-28 00:33:59 +01:00
Boaz1111
8bf47c9905 Pka shuttle projectiles now actually break rocks in one hit (#24627)
bitch

(cherry picked from commit b5e010f0fe7843ea4e3c639444db2d847d1f76bc)
2024-01-28 00:33:56 +01:00