Commit graph

8596 commits

Author SHA1 Message Date
Morbo
283f94dced Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-12-13 20:41:52 +03:00
IanComradeBot
b2a9c227a7 Automatic changelog update 2022-12-13 14:08:57 +00:00
lapatison
ecac835e9f
Translate Upstream #636 (#637)
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
2022-12-13 17:07:50 +03:00
Emisse
1a63172554
Bagel Update 15.7 (#13001) 2022-12-13 07:48:05 -06:00
Emisse
779dd5dbd7
Marathon Update 3.9 (#13002) 2022-12-13 07:46:58 -06:00
Emisse
a918732a59
Box Update 2.3 (#13003) 2022-12-13 07:46:44 -06:00
Emisse
9c8f1df1e3
Omega Update 1.2 (#13004) 2022-12-13 21:28:48 +11:00
Emisse
80235fdef0
CentComm Fax (#13000) 2022-12-13 13:12:47 +11:00
Morbo
a2414e0892 Update locale 2022-12-12 19:01:35 +03:00
Morbo
f0cf42aab3 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Maps/pillar.yml
2022-12-12 18:59:08 +03:00
Checkraze
1923ab3015
Kettle 1.4.3 (#12859)
* Kettle 1.4.3

* fax machines

* hamter
2022-12-12 04:21:36 -06:00
Checkraze
acc129df9a
Moose 3.2.1 (#12984)
* hamter fax

* cloning swap
2022-12-12 04:21:10 -06:00
PJBot
75ed9b8227 Automatic changelog update 2022-12-12 05:20:42 -05:00
Nemanja
bbfa8b5ae6
Remove xenoarch boards from RD locker (#12991) 2022-12-12 04:19:38 -06:00
PJBot
4cbf78646a Automatic changelog update 2022-12-11 22:36:36 -05:00
PJBot
7d551d9590 Automatic changelog update 2022-12-11 22:34:46 -05:00
PJBot
881ba0d48d Automatic changelog update 2022-12-11 19:02:30 -05:00
PJBot
31f30acc8a Automatic changelog update 2022-12-11 13:07:15 -05:00
Morb
dbba104eab
Fax Machine (#11704) 2022-12-12 05:06:11 +11:00
PJBot
2fe900da57 Automatic changelog update 2022-12-11 08:38:13 -05:00
PJBot
da31f9e5ee Automatic changelog update 2022-12-11 08:19:28 -05:00
PJBot
a7a43c8b34 Automatic changelog update 2022-12-11 06:34:40 -05:00
Moony
de7a3413d5
Removes Pillar. (#12977)
* Removes Pillar.

I suppose this is my lesson to never trust people who claim they'll address issues later, because Pillar is a pile of issues that have been unaddressed since it's inception, despite my countless attempts (and growing frustration with) getting them handled.

There's too many issues to list here, so I'm just fully removing the map. Pillar will not be re-added without every single issue being addressed _at the time of PR_ and will be given zero leeway with leaving issues to solve later, because they clearly will never be solved.

* guh

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-12-11 05:33:37 -06:00
PJBot
3d91aee8d5 Automatic changelog update 2022-12-11 06:32:58 -05:00
IanComradeBot
ccfbab8cae Automatic changelog update 2022-12-11 07:01:47 +00:00
lapatison
4e9a5c1bca
Translate Upstream #634 (#635)
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com>
2022-12-10 23:00:42 -08:00
Morbo
2469fb6cf2 Hotfix research technology icon state 2022-12-11 09:46:43 +03:00
Morbo
b6b095e31b Update locale 2022-12-11 08:01:50 +03:00
Morbo
024f4113a9 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-12-11 07:59:37 +03:00
metalgearsloth
58d57c2e8e
Re-save nukie planet again (#12967) 2022-12-11 11:32:36 +11:00
PJBot
95358f3b66 Automatic changelog update 2022-12-10 17:56:21 -05:00
Errant
b6e382fe82
Handcuffing in Harm mode (#12838) 2022-12-11 09:55:18 +11:00
PJBot
1121cd3a84 Automatic changelog update 2022-12-10 16:01:07 -05:00
PJBot
85624fa9b5 Automatic changelog update 2022-12-10 15:59:28 -05:00
IanComradeBot
19ba5db7c7 Automatic changelog update 2022-12-10 20:11:55 +00:00
Morb
f458d9d258
Classic traitor alert (#632) 2022-12-10 12:10:51 -08:00
Morb
6ad4a10b29
Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
IanComradeBot
3ff31edc88 Automatic changelog update 2022-12-10 17:27:17 +00:00
lapatison
9422eb48ad
Translation edits (#629) 2022-12-10 09:26:13 -08:00
IanComradeBot
c0c47d74cc Automatic changelog update 2022-12-10 17:08:32 +00:00
lapatison
4c38d7162e
Translate Upstream #628 (#630) 2022-12-10 09:07:26 -08:00
PJBot
819853bffa Automatic changelog update 2022-12-10 12:06:44 -05:00
Nemanja
913e1ee676
Exosuit: Ripley (#12668)
* mechs

* interaction relay

* atmos handling

* fuck around with interaction events

SPAGHETTI CODE OH MY GOD

* more sprites and whatever the hell

* more mech shit

* more shit for equipment

* starting equipment (for nukie mechs and such)

* equipment cycling

* starting with some of the ui

* a fat chunk of ui prototyping

* done tinkering with ui

* a bunch of ui stuff and what have yous

* cleaning up grabber and state handling

* make the ui actually functional + watch me port a million icons

I swear i'll prune the sprites later blease

* start on construction

* construction yo mamma

* remove some unused files

* fix a silly

* make the graph sane

* make it actually constructible.

* print the boards as well, bozo

* rebalance part prices

* eject action

also i appease the russians by remembering to localize

* Punch Shit

* make mech integrity and repairs work

* Make the UI more based

STOMP STOMP STOMP STOMP

* make equipment even more based

* batteries and other such delights

* make the ui look pimpin af

* make the construction mega based

* UI but so epic

* equipment

* some sweat tweaks

* damage rebalancing

* restructure tech

* fix some shit

* mechs inherit access

* make icons actually use sprite specifiers

* TRAILING COMMAA!!!!!

* fix a mild indentation sin

* undo this change because it isn't needed

* actually fix this

* secret webeditting shhhh

* place this tech here

* comments

* foo
2022-12-10 11:05:39 -06:00
Morbo
e5f3f99478 Fix emergency shuttle 2022-12-10 16:07:01 +03:00
Morbo
e0b086af1b Update locale 2022-12-10 14:07:49 +03:00
Morbo
42bd050888 Merge remote-tracking branch 'upstream/master' into upstream-sync2 2022-12-10 14:04:43 +03:00
PJBot
11d81aa155 Automatic changelog update 2022-12-10 04:32:06 -05:00
PJBot
e6083a5c48 Automatic changelog update 2022-12-09 22:44:22 -05:00
Vordenburg
80642c6ddc
Fix toy ammo whitelist. (#12946) 2022-12-10 14:43:19 +11:00
PJBot
b491235ad0 Automatic changelog update 2022-12-09 21:09:44 -05:00