Commit Graph

19503 Commits

Author SHA1 Message Date
lzk
e49a0eb3b6 Add warning cones to engivend (#29085)
Add cones to engivend
2024-06-18 17:02:05 +03:00
metalgearsloth
b0b76a1133 Replace StationRandomTransform (#29149)
* Revert "Rotate and Offset station CCVar nuke (#26175)"

This reverts commit 44b20f60ff.

# Conflicts:
#	Content.Server/Station/Systems/StationSystem.cs
#	Resources/Prototypes/Maps/europa.yml

* Fix

* Review
2024-06-18 23:27:34 +10:00
PJBot
92159edba3 Automatic changelog update 2024-06-18 12:12:43 +00:00
metalgearsloth
65821c96f4 Fix conveyor mispredicts (#28157)
* Fix conveyor mispredicts

Instead of tracking active conveyors we instead track the conveyed entities. This also handles things like stacking conveyors more gracely.

* Fix ActiveConveyor

* Fix lerping
2024-06-18 22:11:36 +10:00
PJBot
af7e599654 Automatic changelog update 2024-06-18 11:00:45 +00:00
Tayrtahn
e5ef2a358c Implement vital chef's hat functionality (#25950)
* Implement crucial chef's hat functionality

* Unified stopping code and added events.

* Added documentation to events

* Rerun tests

* Made review changes, and fixed potential desync bug.

* Update whitelist
2024-06-18 20:59:37 +10:00
Mr. 27
82c4db67bc Fix female reptilians not having gasp sounds (#29143)
inital
2024-06-18 13:56:37 +10:00
Tayrtahn
0cf56b9bbd Fix DresserFilled storagefill rarely causing an error (#29135)
Add ClothingUniformJumpskirtColorPink to an OrGroup
2024-06-17 19:11:17 -04:00
PJBot
e04492e02d Automatic changelog update 2024-06-17 23:10:25 +00:00
Tayrtahn
9b5219a226 Fix double label on chem jugs (#29137) 2024-06-17 19:09:19 -04:00
Ed
4c12b6e7c6 cool hat, delete cave arena (#256)
* hat and glasses

* delete cave arena

* Update default.yml
2024-06-17 23:48:42 +03:00
Ed
02b7fe5933 marking update (#254)
* new horny horns

* fuck this horns

* horns and hairs

* glasses resprite

* наращивание волос

* больше наращивания

* Update braid.png
2024-06-17 22:11:22 +03:00
Tayrtahn
e5a85e2a13 Make wearing an Ushanka also apply accent to your name (#29111) 2024-06-17 14:03:55 -04:00
Ed
4ecdb6f296 Update lube.ftl 2024-06-17 16:32:55 +03:00
Ed
917f2de69e Update glue.ftl 2024-06-17 16:16:09 +03:00
Ed
ac3a7a5c1b Update cluwne.ftl 2024-06-17 15:06:46 +03:00
Ed
f1c4e9e382 Update transformable-container-component.ftl 2024-06-17 14:48:40 +03:00
Ed
04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
2024-06-17 14:20:38 +03:00
PJBot
efbcce21bd Automatic changelog update 2024-06-17 10:54:53 +00:00
Ubaser
5038012b67 Add new lizard horns, Demonic (#29022)
add
2024-06-17 13:53:47 +03:00
PJBot
b02e838926 Automatic changelog update 2024-06-17 05:21:53 +00:00
PJBot
ffcaf61ffa Automatic changelog update 2024-06-17 03:31:16 +00:00
deltanedas
c332677971 remove robotics console emag checking, make it a bit fairer (#27876) 2024-06-16 23:30:10 -04:00
PJBot
7ff557d1ef Automatic changelog update 2024-06-17 03:22:36 +00:00
Cojoke
390f8d19d1 Makes Eyepatches Flippable (#26277) 2024-06-16 23:21:29 -04:00
deltanedas
f7aca6b15f nuke actions from map files (#28589) 2024-06-16 23:03:01 -04:00
PJBot
72665eb6e0 Automatic changelog update 2024-06-17 01:14:39 +00:00
PJBot
8a199a882b Automatic changelog update 2024-06-16 23:25:39 +00:00
Futuristic-OK
1482345330 Delete RandomSentience event (#28982) 2024-06-17 02:24:29 +03:00
Jaraten
2b577ebfbe resprite glasses (#251) 2024-06-17 00:46:02 +03:00
Jaraten
f79c6de912 fix cardboard wall sprites (#250)
* fix cardboard wall sprites

* То что лень делать тебе, придется делать мне.

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
2024-06-17 00:40:35 +03:00
Tayrtahn
89a9f07c3a Add a system for modifying entity names without causing conflicts (#27863) 2024-06-16 15:38:53 -04:00
deltanedas
ee2769ed9f atlas update (#28514)
* atlas update

* unkill previous changes

* fix lawyer room

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-16 13:38:00 -06:00
Nemanja
5e50bd83d6 Missing meteor presets (#29044)
* add meteors into missing game presets

* changes for real

* implement code

* this too
2024-06-16 21:37:43 +02:00
lzk
31d155dfe0 Update box (#28348)
* Update box

robotics console

* Morgue airlock

* update
2024-06-16 13:37:37 -06:00
lzk
ce5641036c Update fland (#28347)
robotics console
2024-06-16 13:37:26 -06:00
lzk
92e6e10c0a Update train (#28345)
robotics console
2024-06-16 13:37:17 -06:00
lzk
93ea4c07ff Update packed (#28346)
robotics console
2024-06-16 13:37:08 -06:00
lzk
99358e8d4d Update marathon (#28344)
* Update marathon

robotics console

* morgue door
2024-06-16 13:36:54 -06:00
lzk
771c34c304 Update omega (#28343)
* Update omega

robotics console

* morgue door
2024-06-16 13:36:38 -06:00
lzk
fdb487ccfe Update origin (#28342)
robotics console
2024-06-16 13:36:11 -06:00
Ed
e4678dc66e Nails, Hammer tool and construction recipe update (#249)
* foundation resprite

* stone material, stack

* nails!

* mini hammer resprite

* hammer tool

* wall building update

* table crafting update

* bonfire craft update

* add wooden wall craft

* chest craft update

* Update attributions.yml

* Update tables.yml

* Update simple.yml
2024-06-16 18:31:47 +03:00
PJBot
c9540db6b4 Automatic changelog update 2024-06-16 11:59:03 +00:00
deltanedas
1cb9f5dbed add carp hardsuit for traitors (#25155)
* FactionClothing

* swtich carp to the Dragon faction

* add carp hardsuit

* add carp hardsuit to uplink

* fixes

* webedit ops 1

* why did i name it that wtf

* among

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-16 21:57:57 +10:00
Jaraten
f0c3d99706 repsite hammer (#248) 2024-06-16 14:40:58 +03:00
PJBot
22efc2b4ac Automatic changelog update 2024-06-16 11:31:41 +00:00
PJBot
ac979640bf Automatic changelog update 2024-06-16 11:28:41 +00:00
Cojoke
26f809aebf Instruments for Musician lodouts (#29059)
* Musician Instruments to Musician lodouts

* Move instruments to their own file, fix instruments spawning on the floor, Found bug of Loadout dropping items on the floor rather than sorting inventory

* Whoops, I removed bagpipes for some reason
2024-06-16 21:27:35 +10:00
deltanedas
f730d120c7 give spiders unique venom reagent (#29066)
* add mechanotoxin

* make tarantulas use mechanotoxin

* trolled

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-16 21:26:59 +10:00
Nemanja
9348a5cea6 Apc & Substation resprite (#28998)
* substation

* apcs

* top pixels

* new screens
2024-06-16 05:43:22 -05:00