Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Upstream #56

Merged
merged 128 commits into from
Jan 17, 2025
Merged
Changes from 1 commit
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
bc0708a
AddTraitSpecial (#1528)
Peptide90 Jan 13, 2025
7769002
Fix NTR Stamp Icon On Paper & Fix Job IDs (#1534)
CerberusWolfie Jan 14, 2025
8b74710
Automatic Changelog Update (#1534)
SimpleStation14 Jan 14, 2025
3e8a7d9
Station AI Features and Fixes (Also General Fixes) (#1525)
sleepyyapril Jan 14, 2025
b87cbad
Automatic Changelog Update (#1525)
SimpleStation14 Jan 14, 2025
cc85824
FTL Fixes (#1539)
sleepyyapril Jan 14, 2025
90db21a
Automatic Changelog Update (#1539)
SimpleStation14 Jan 14, 2025
da14cfe
Fix Server Crash on Shutdown Due to DB Notifications (#31379) (#1542)
sleepyyapril Jan 14, 2025
1b7d42e
Fix cargo job title not showing up
sleepyyapril Jan 14, 2025
5f464fc
Fixed portal artifacts targeting the Ai (#32677)
Gamer3107 Oct 14, 2024
83d68bf
Add outerclothing as identity blocker
sleepyyapril Jan 14, 2025
7318cfb
Fix layout on wires UI (#33714)
PJB3005 Dec 4, 2024
6bcdd23
Allow ai to understand if its handcuffed. (#30402)
IProduceWidgets Aug 2, 2024
cf121be
Reorder priorities in `MeleeCombatCompound` (#30066)
osjarw Aug 11, 2024
57c3a28
ai stays seated and pulled while cuffed. (#30397)
IProduceWidgets Aug 8, 2024
f9ac956
Sprite Movement working with AI movement (#33494)
TheShuEd Dec 18, 2024
0cd85d0
Fix null exceptions in SurveillanceCameraMonitorSystem (#29275)
Tayrtahn Jun 21, 2024
e91fb14
decouple ItemToggle from PowerCellDraw (#31392)
deltanedas Aug 25, 2024
a17969f
Fix defibs draining battery when turned off (#31593)
themias Aug 28, 2024
fa2fed1
ItemToggle + slots stuff (#31312)
slarticodefast Aug 31, 2024
251a21d
Fix energy shield visuals (#31619)
slarticodefast Aug 30, 2024
1343d73
Fix PDA resolve error
sleepyyapril Jan 14, 2025
04406f6
Fix random bark
sleepyyapril Jan 14, 2025
5bb56c0
Update MoverController.cs to not use Component.Owner (#29965)
Plykiya Aug 2, 2024
7df15b2
Fix errors
sleepyyapril Jan 14, 2025
943982d
Device-list limiting (#30997)
Magicalus Aug 19, 2024
99423d8
Fix more test fails
sleepyyapril Jan 14, 2025
962b841
hm
sleepyyapril Jan 14, 2025
bed3627
More General Fixes (#1547)
sleepyyapril Jan 14, 2025
cfc6e0e
Automatic Changelog Update (#1547)
SimpleStation14 Jan 14, 2025
a8cb5a9
Space Wind Version 3 (#1537)
VMSolidus Jan 15, 2025
7428cd8
Automatic Changelog Update (#1537)
SimpleStation14 Jan 15, 2025
6584a62
Small Space Wind Optimization Hotfix (#1550)
VMSolidus Jan 15, 2025
94e33f4
Assay Power Hotfix (#1551)
VMSolidus Jan 15, 2025
76dfa63
Automatic Changelog Update (#1551)
SimpleStation14 Jan 15, 2025
c8a6209
Update README.md (#1543)
sleepyyapril Jan 15, 2025
a1b588f
Ports "Fix animation looping bugs" from wizden.
spess-empyrean Jan 15, 2025
182820f
Ports "Refactor LightBehaviorSystem" from wizden
spess-empyrean Jan 15, 2025
a786840
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
spess-empyrean Jan 15, 2025
571813b
Meta Station with Holopads (#1553)
Mike32oz Jan 15, 2025
94291c4
Automatic Changelog Update (#1553)
SimpleStation14 Jan 15, 2025
35c1651
Extend Access for NTR & BSO (#1544)
astriloqua Jan 15, 2025
cec1560
Automatic Changelog Update (#1544)
SimpleStation14 Jan 15, 2025
36a3938
Increases .35 Mag Size From 10 to 12 (#1532)
BlueHNT Jan 15, 2025
a58fdc5
Automatic Changelog Update (#1532)
SimpleStation14 Jan 15, 2025
03b7a8a
Fix Night Vision (#1554)
Piras314 Jan 15, 2025
5f56086
Automatic Changelog Update (#1554)
SimpleStation14 Jan 15, 2025
9f707b6
NVS Gax Update: TEG 100% Real (#1517)
Ichaie Jan 15, 2025
1b131c6
Automatic Changelog Update (#1517)
SimpleStation14 Jan 15, 2025
f0f9512
Label Rendering For Vending Machines and Item Preferences Menus (#1538)
NeLepus Jan 15, 2025
1f1e3b4
Automatic Changelog Update (#1538)
SimpleStation14 Jan 15, 2025
5273504
Update Robust Toolbox to v239.0.1 (#1555)
Piras314 Jan 15, 2025
23c225e
Automatic Changelog Update (#1555)
SimpleStation14 Jan 15, 2025
1885d33
Apply suggestions from code review
spess-empyrean Jan 15, 2025
0f51c37
Fix Even More Issues (#1559)
sleepyyapril Jan 16, 2025
b037172
Automatic Changelog Update (#1559)
SimpleStation14 Jan 16, 2025
0b1fcbe
Add Security Officer Playtime Requirement (#1561)
CerberusWolfie Jan 16, 2025
dc1406d
Automatic Changelog Update (#1561)
SimpleStation14 Jan 16, 2025
759299a
Fix Big Security Glasses Not Having HUD (#1557)
angelofallars Jan 16, 2025
78347d7
Automatic Changelog Update (#1557)
SimpleStation14 Jan 16, 2025
5585783
increase brain eat delay and show popup when trying to eat brain
angelofallars Jan 16, 2025
dd5ee5a
add popup for eat success
angelofallars Jan 16, 2025
c809316
Fix a funny bug trying to send popup into food instead of target
angelofallars Jan 16, 2025
fd916a7
Merge branch 'master' into brain-eat-delay
angelofallars Jan 16, 2025
36a9789
add movement cost to plastic flaps
angelofallars Jan 16, 2025
3fa788c
Fix Ripley control panel (#30325)
themias Jul 25, 2024
672c537
Make small clamp use 2% battery instead of recharging 2% battery. (#3…
JIPDawg Sep 20, 2024
3d6c151
fix voice mask chameleon menu (#32546)
slarticodefast Oct 2, 2024
5cf5f89
Wires ui tooltip localization (#32284)
chavonadelal Sep 18, 2024
aae8852
Fix ACC wire light not appearing (#30453)
themias Jul 30, 2024
2b170b8
UI improvements for holopads (#34055)
chromiumboy Dec 28, 2024
ee12c0f
Holopads no longer log broadcasted speech and emotes in the chat (#34…
chromiumboy Dec 31, 2024
e2de644
Fix layout on wires UI (#33714)
chromiumboy Jan 2, 2025
2f763f7
Crayons buffed to 45 uses (#32061)
Kanashi-Panda Sep 17, 2024
882ce26
fix crayon (#30263)
Plykiya Jul 23, 2024
26ffe94
Improve crayon UI to not be stuck in 1996 (#33101)
SaphireLattice Nov 16, 2024
4f863f0
fix bloodred boots (#20309)
Ilya246 Sep 18, 2023
a8537eb
Fix all prisoner/AI/borg spawnpoint issues
sleepyyapril Jan 16, 2025
3f0f797
Sort crayons properly.
sleepyyapril Jan 16, 2025
e1bf09b
!
sleepyyapril Jan 16, 2025
25c1da6
Speech is relayed by holopad holograms (#33978)
chromiumboy Jan 2, 2025
3efbb58
Imports
sleepyyapril Jan 16, 2025
ded7a46
No base
sleepyyapril Jan 16, 2025
4a6b71d
Remove extra whitespace
sleepyyapril Jan 16, 2025
04d0d4a
Fix YML fail due to outdated UserInterfaceComponent
sleepyyapril Jan 16, 2025
e4094b1
fix borg ui mispredict opening (#28305)
EmoGarbage404 May 26, 2024
8a375c6
Fix yml
sleepyyapril Jan 16, 2025
303d94d
Add popup to ActivatableUIRequiresPanel
sleepyyapril Jan 16, 2025
f2c01dc
increasse flaps slow even more
angelofallars Jan 17, 2025
662ad8a
Fix popup prediction
sleepyyapril Jan 17, 2025
0c6ff00
Arachne Standing Up Fix (#1571)
angelofallars Jan 17, 2025
b07d6e1
Automatic Changelog Update (#1571)
SimpleStation14 Jan 17, 2025
ed98c3a
Even Even More Fixes (#1572)
sleepyyapril Jan 17, 2025
7ce8023
Automatic Changelog Update (#1572)
SimpleStation14 Jan 17, 2025
ea9f7cb
Ports Fixes to some Looping Systems, LightBehaviorSystem Refactor Fro…
VMSolidus Jan 17, 2025
b49b960
Automatic Changelog Update (#1552)
SimpleStation14 Jan 17, 2025
ed5e26b
update trait examples for slips/difficult terrain
angelofallars Jan 17, 2025
354da0e
Update Content.Server/Nutrition/Components/FoodComponent.cs
angelofallars Jan 17, 2025
5b6f15a
Merge branch 'master' into flaps-movement-slow
angelofallars Jan 17, 2025
d965c73
Add Plastic Flaps Movement Slow (#1573)
VMSolidus Jan 17, 2025
536deb6
[Shitmed] Increase Brain Eating Time & Show Brain Eating Popup (#1563)
VMSolidus Jan 17, 2025
89101e3
Automatic Changelog Update (#1573)
SimpleStation14 Jan 17, 2025
3a1c2dd
Automatic Changelog Update (#1563)
SimpleStation14 Jan 17, 2025
638071c
Glimmer Rework 1: "Swingy Glimmer" (#1480)
VMSolidus Jan 17, 2025
b56f123
Automatic Changelog Update (#1480)
SimpleStation14 Jan 17, 2025
08154a9
Modular Computer System (#1556)
Erisfiregamer1 Jan 17, 2025
d185170
Automatic Changelog Update (#1556)
SimpleStation14 Jan 17, 2025
6c43d00
Martial Artist Rework + Fix MeleeWeapon Wizmerge Bugs (#1560)
angelofallars Jan 17, 2025
b5403ba
Automatic Changelog Update (#1560)
SimpleStation14 Jan 17, 2025
19a350f
Handheld Frequencies (#1574)
sleepyyapril Jan 17, 2025
ae63a45
Automatic Changelog Update (#1574)
SimpleStation14 Jan 17, 2025
86f9dfd
Lobby Background Credits (#1558)
Piras314 Jan 17, 2025
b1162a3
Automatic Changelog Update (#1558)
SimpleStation14 Jan 17, 2025
a9f7fe8
Downstream Port (#1509)
sleepyyapril Jan 17, 2025
5acb331
Automatic Changelog Update (#1509)
SimpleStation14 Jan 17, 2025
00064a6
IPC Facial Hair (#1575)
angelofallars Jan 17, 2025
58edabd
Automatic Changelog Update (#1575)
SimpleStation14 Jan 17, 2025
e29ee86
Remove All Usages of DepartmentTimeRequirement (#1576)
sleepyyapril Jan 17, 2025
5990b03
Make Loadout Firearms Comply With Space Law (#1522)
VMSolidus Jan 17, 2025
5d1dbe4
Alternative Bunny Ears (#1577)
angelofallars Jan 17, 2025
7bf3692
Automatic Changelog Update (#1577)
SimpleStation14 Jan 17, 2025
64c1196
Fix Mining Drills & Reduce Stamina Cost (#1579)
angelofallars Jan 17, 2025
cc1cf10
Automatic Changelog Update (#1579)
SimpleStation14 Jan 17, 2025
b8a4870
Add Magistrate, Dignitary Department, and Minor FTL Fixes (#1536)
CerberusWolfie Jan 17, 2025
eefa06d
Automatic Changelog Update (#1536)
SimpleStation14 Jan 17, 2025
b338f1b
Vigor Buff & Lethargy Nerf (#1578)
angelofallars Jan 17, 2025
0ba8772
Automatic Changelog Update (#1578)
SimpleStation14 Jan 17, 2025
9f6171c
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
Aidenkrz Jan 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
increasse flaps slow even more
angelofallars committed Jan 17, 2025
commit f2c01dc71fd57f56c1524e28a03d2951dcd23365
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Structures/plastic_flaps.yml
Original file line number Diff line number Diff line change
@@ -123,5 +123,5 @@
- type: StaticPrice
price: 100
- type: SpeedModifierContacts
walkSpeedModifier: 0.3
sprintSpeedModifier: 0.3
walkSpeedModifier: 0.25
sprintSpeedModifier: 0.25