Commit graph

24469 commits

Author SHA1 Message Date
lzk
fdebe2e8a4
Bounties, antags general, minor antags guidebook translate (#1677) 2023-12-29 16:45:28 +03:00
AwareFoxy
60e95c310b
Translate ninja guidbook (#1684) 2023-12-29 16:36:14 +03:00
lapatison
b9c4920dd9
Translation fixes (#1691) 2023-12-29 16:17:18 +03:00
lzk
ac93936bf8
Botany, survival, cyborgs guidebook translate (#1675) 2023-12-29 16:13:00 +03:00
Jerry
065f229172
more new year lobby arts (#1689) 2023-12-28 00:33:46 +03:00
lapatison
227ebcbf9d
Translate Upstream #1687 (#1688) 2023-12-28 00:20:45 +03:00
Syxapik
8080d7e642
[MapUpdate] Avrite (#1690) 2023-12-28 00:13:37 +03:00
poeMota
1d7c88b631
Delta update (#1685)
Co-authored-by: poeMota <belochuc@gmail.com>
2023-12-27 16:25:23 +03:00
Morb
b7224da34d
Merge pull request #1687 from space-syndicate/upstream-sync
Upstream sync
2023-12-27 03:09:29 +03:00
Morb0
0a7f00f631 Update locale 2023-12-27 02:53:57 +03:00
Morb0
27798dc082 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-27 00:32:56 +03:00
lzk
4d42d00194
Fix awful slimepeople parts sprites (#22969)
fix awful slime parts
2023-12-27 08:22:33 +11:00
lzk
b52e9bb64a
some locale tweaks (#1686) 2023-12-26 22:51:52 +03:00
LankLTE
d75d7d7187
fix ahelp relay times (#23001)
RoundDuration instead of CurTime
2023-12-26 06:57:52 -06:00
Chief-Engineer
f6b8f183d7
Revert "temporarily override WizDen admin names" (#23004)
Revert "temporarily override WizDen admin names (#22878)"

This reverts commit 0f6d062da4.
2023-12-26 06:57:11 -06:00
Morb0
6324b0fb8e Fix forced manifest instead of ACZ for public build 2023-12-26 14:54:24 +03:00
lapatison
82083e37e3
Translate Upstream #1681 (#1683)
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2023-12-26 14:41:49 +03:00
lzk
aadc75a07a
Fix potted plants going over doors (#22869)
* Update potted_plants.yml

* Update potted_plants.yml
2023-12-26 19:27:15 +11:00
Avalon
ef726a9cb0
fix the mothroach crate saying it contains six mothroaches instead of four (#22968)
FINALLY FUCKING FIX THAT ONE FUCKING LIKE FUCK IT
2023-12-26 19:22:34 +11:00
Leon Friedrich
d3ae3776ed
Update engine to v195.0.1 (#22994) 2023-12-26 15:04:57 +11:00
Ubaser
fd3c922a08
Add chaplain stoles (#22955)
add
2023-12-25 18:05:59 -07:00
qwerltaz
88b59c0053
fix origin teg (#22979) 2023-12-25 18:05:39 -07:00
Boaz1111
cde532bfa4
fixed the sulfacid issue, made some more chems use the industrial chems (#22981) 2023-12-26 09:33:20 +11:00
lzk
33ddee4280
Change looc prefix (#1676) 2023-12-26 00:20:05 +03:00
Morb
85798bd851
Make thieves not pacifist (#1682) 2023-12-26 00:19:16 +03:00
Kara
ab6726136f
Optimize artifact analyzer UI state sending (#22949)
* Remove n rename cruft old shit

* Artifact analyzer UI updating optimization

* Revert "Remove n rename cruft old shit"

This reverts commit 8789338fb20f77d79c5b0e40719896efe0103fcc.
2023-12-25 12:50:10 -08:00
Morb
c3749cc685
Merge pull request #1681 from space-syndicate/upstream-sync
Upstream sync
2023-12-25 21:52:11 +03:00
lzk
b8ab292dea
Move corvax datasets to corvax folder (#1680) 2023-12-25 21:42:22 +03:00
Morb0
edde2b651d Update locale 2023-12-25 21:33:26 +03:00
Morb0
918f543c2c Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
#	Resources/Textures/Objects/Devices/nuke.rsi/meta.json
#	Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
2023-12-25 21:03:49 +03:00
LordCarve
7b46390b9c
Removed senior roles from job supervisor locales (#22972) 2023-12-25 12:46:42 -05:00
metalgearsloth
c326e5d087
Fix multi-ghosts (#22964)
* Fix multi-ghosts

* Fix mind visits
2023-12-26 00:19:12 +11:00
lzk
724cde264c
Botany yaml fixing (#22865)
* 1

* Update chapel.yml

* Revert "Update chapel.yml"

This reverts commit 3e297a1b20254823a088af2aa3d179184c377638.

* add to seeds vendor
2023-12-25 20:56:17 +11:00
Kara
742fd7420b
Thief description & grammar fixes (#22951)
* Thief description & grammar fixes

* sad

* cant do that sad
2023-12-25 01:13:12 -08:00
Flareguy
450414c8fc
Adds gingerbread men to the game (#22927)
adds gingerbread men to the game
2023-12-25 01:11:37 -07:00
Emisse
dd0270a252
bagel update (#22948) 2023-12-25 01:11:05 -07:00
Emisse
789fd89454
reduce nuke required floor radius variable (#22947)
Update NukeComponent.cs
2023-12-25 01:09:10 -07:00
Emisse
0144bbdf4b
nukieplanet update (#22946) 2023-12-25 01:09:00 -07:00
Emisse
213eb75912
centcomm update (#22944) 2023-12-25 01:08:52 -07:00
LankLTE
82ddf451e6
change the restart vote to have no effect with admins online (#22945)
* Change the vote and cvar

* Only denies successful votes

* Add comments because I'm a good coder, I swear

* I added a space to the first line of ccvars it's so over
2023-12-24 23:55:56 -08:00
reverie collection
4cd4805a01
Atmos crab pet: Tropico! (#22773)
* tropico mob fully functional, adjusted base crab mob

* FINALLY YES I GOT THE MAPS COMMITTED

* origin fix hopefully

* removed ghost role

* undid map changes, pulled from current master

* tropico is no longer communist
2023-12-25 00:39:20 -07:00
metalgearsloth
9a40cf81f5
Add sprite movement states (#22940)
* Add sprite movement states

Did it for borgs for reference for future implementations.

* Fix

* Fix prediction issue

* review
2023-12-24 23:34:21 -08:00
Leon Friedrich
721a445bbd
Fix pulling mispredicts (#22941)
* Fix pulling mispredicts

* Make behaviour consistent

* Good ol terminating entities
2023-12-25 00:33:32 -07:00
Leon Friedrich
9eaa4c3a5d
Make cargo arbitrage test ignore gambling crate (#22943) 2023-12-25 00:15:33 -07:00
LankLTE
e10a314ec2
add round time to the ahelp relay (#22937)
* Basic roundtime implementation

* Forgot to clamp the length checker
2023-12-25 17:57:00 +11:00
Nemanja
00813171c1
Automatic holiday sprites (#22929) 2023-12-24 23:52:43 -07:00
deltanedas
2d213b8ab0
give plasma half of co2 air alarm threshold (#22938)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-24 23:51:32 -07:00
Kara
ba88a9a022
Revert "Add YAML gas reactions (#22803)" (#22939)
This reverts commit 054321d2c2.

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-12-24 23:50:42 -07:00
Leon Friedrich
0baffe3243
Fix closet skeletons spawning in nullspace (#22942) 2023-12-24 23:48:58 -07:00
Leon Friedrich
8587c3778a
Make some prototypes use frozen collections (#22576)
* Make some prototypes use frozen collections

* poke tests

* Remove frozen dictionary enumeration
2023-12-25 15:12:22 +11:00