Commit Graph

1761 Commits

Author SHA1 Message Date
Ubaser
f4ca034075 Update Core (#26791)
* add

* invalid
2024-04-06 23:54:25 -06:00
hamurlik
311ad83f05 Fix dirt decals in reach not being cleanable (#26636)
made all dirt decals cleanable

Co-authored-by: hamurlik <renoDeath@protonmail.com>
2024-04-01 13:14:28 +11:00
Wrexbe (Josh)
e7af28d22a Fix fox spawn on reach (#26584)
Co-authored-by: wrexbe <wrexbe@protonmail.com>
2024-03-31 12:59:06 +11:00
Wrexbe (Josh)
7130d1ca2f Fix Meta evac shuttle name (#26587) 2024-03-31 12:24:26 +11:00
Pieter-Jan Briers
89db4409a4 Remove CRLF, enforce with workflow (#26401)
* Check for CRLF in actions workflow

Make emisse weep

* Copy paste bottom text

* I would like to thank StackOverflow for this spite PR.

* Mention file name in message because the workflow tab doesn't display it.

* dos2unix everything
2024-03-24 22:06:17 +01:00
IProduceWidgets
f2112e6e9d Make fland's mail into wheel-and-spoke distribution. (#26404) 2024-03-24 14:11:02 -06:00
brainfood1183
af6a2d7792 Origin Station Update 12.03.2024 (#26055)
* Origin Station Update 12.03.2024

* implement PJB requested changes

* changed ap magnum rounds for magnum rounds.

* added west side maints door per pjb request.

* removed laser glass box from captain quarters.
2024-03-24 12:58:17 -06:00
Leon Friedrich
ec761114ea Run fixgridatmos for cargo & emergency shuttle (#26382)
Fix cargo & emergency shuttle
2024-03-25 03:17:56 +11:00
Emisse
952b7f4c4e Haunted dungeon template (#23768)
* haunted dungeon

* Initial work

Still needs prefab gen work to make it interesting.

* ime a worm

* weh

* Work

* Slight tweaks

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-24 14:37:18 +11:00
Emisse
596f9a6c2c bagel update (#26326) 2024-03-21 21:22:02 -06:00
Nairod
395024a652 Fix Fland's Cargo Shuttle Atmos (#26273) 2024-03-20 11:16:53 +11:00
Emisse
0493130591 reach update (#26224)
* reach update

* fixgridatmos

* invalid link error

* move arrivals to the side

* who are we if we just get squashmerged anyway

* chocolate machine
2024-03-18 00:52:28 -06:00
wafehling
c0bbbc33c1 Trading Outpost now has half buy-only and half sell-only pallets (#25955)
* Added new Buy & Sell specific cargo pallets

* Remapped trading outpost with new pallets, tweaked texture

* Removed debug message

* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

Alright, updating all the references to it.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Changed textures, changed to enum instead of string for pallet type check

* Few minor code tweaks/formatting fixes

* Missed the prototype change

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-14 10:26:25 +11:00
Ubaser
dc0e4ada62 Update Core (#25927)
* add

* invalid
2024-03-12 02:56:44 -06:00
Emisse
52b2724a14 marathon update (#26016) 2024-03-11 16:10:16 -06:00
Emisse
463817056e infiltrator update (#25923) 2024-03-07 17:52:49 -07:00
Alzore
5f61380209 Vegan Meatball (#24650)
* veganmeatball

* testedthis

* moreplant
2024-03-07 22:37:57 +03:00
Emisse
5a77e523c1 resave europa (#25848)
europa
2024-03-04 16:52:58 -07:00
Emisse
79b1c0e26d resave origin (#25846)
origin update
2024-03-04 16:41:08 -07:00
Emisse
40fb39e7d1 resave fland (#25845)
fland update
2024-03-04 16:29:08 -07:00
Ed
bdcf144442 Frozen hydroponic dungeon (#25837)
+dungen
2024-03-04 16:13:34 -07:00
Ed
ace8285440 Mineshaft (#25733)
* content

* catwalks

* fix fucking icons

* finish PR

* +1 room

* fix
2024-03-03 23:32:33 -07:00
metalgearsloth
c5486873db Shuttle console + FTL rework (#24430)
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup
2024-03-03 18:39:19 +11:00
brainfood1183
2135fdf776 Origin Station Update 01.03.2024 (CMO bedsheet) (#25756) 2024-03-01 23:43:10 -07:00
Kukutis96513
d0f943c4a9 Add detective to saltern (#25714)
* weh.

* map stuff..

* banish the weh out of my files (it's trying to escape my computer!!)
2024-02-29 15:35:37 -07:00
Flareguy
7b9346d2a8 New Space Ruin: Syndicate Dropship (from /tg/) (also adds plastitanium windows) (#25723)
* adds a new syndie space shuttle ruin + plastitanium windows

* the green goomba gaming

* fixe

* visor > gloves
2024-02-29 15:33:35 -07:00
Emisse
3d92e2bd93 train update (#25707) 2024-02-29 02:03:23 -07:00
Rainfey
4e6c59cfe5 Refactor antag rule code (#23445)
* Initial Pass, Rev, Thief

* Zombie initial pass

* Rebase, Traitor

* Nukeops, More overloads

* Revert RevolutionaryRuleComponent

* Use TryRoundStartAttempt, Rewrite nukie spawning

* Comments, Add task scheduler to GameRuleSystem

* Zombie initial testing done

* Sort methods, rework GameRuleTask

* Add CCVar, Initial testing continues

* Might as well get rid of the obsolete logging

* Oops, i dont know how to log apparently

* Suggested formatting fixes

* Suggested changes

* Fix merge issues

* Minor optimisation

* Allowed thief to choose other antags

* Review changes

* Spawn items on floor first, then inserting

* minor tweaks

* Shift as much as possible to ProtoId<>

* Remove unneeded

* Add exclusive antag attribute

* Fix merge issues

* Minor formatting fix

* Convert to struct

* Cleanup

* Review cleanup (need to test a lot)

* Some fixes, (mostly) tested

* oop

* Pass tests (for real)

---------

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
2024-02-29 17:25:10 +11:00
Emisse
cb45b6c072 train update (#25626) 2024-02-26 17:12:46 -07:00
Flareguy
4bf2364f5f fixes the old ai sat ruin's lights (#25615) 2024-02-26 15:58:16 -07:00
metalgearsloth
d0df5ed5fa Revert "Remove handheld crew monitor (#24761)" (#25439)
* Revert "Remove handheld crew monitor (#24761)"

This reverts commit bbc6d29d21.

# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Research/biochemical.yml
#	Resources/migration.yml

* changes

* zeweh

* dergs
2024-02-22 22:00:35 +11:00
Emisse
a18e2c0547 packed update (#25437) 2024-02-21 04:22:29 -07:00
Krunklehorn
fb9ddaba9d Updates to Packed (#24907)
Removed Chef counter windoors, added RD dresser, put bedsheets in all head dressers except captain's
2024-02-20 23:59:06 -07:00
Emisse
9068f86cdd train update (#25428)
* train update

* argh

* forgor
2024-02-20 23:36:31 -07:00
Ed
f64a32990a Train station (#24927)
* some content

* some next content

* fixes

* remove stained window

* return bot message?

* woah! Full map added!

* map update

* big update

* camera server

* Corvax playtest feedback

* add mail system and 30$ meteor shield

* update

* updatik

* hardwork

* pipip

* update

* remove from mappool

* fixes

* sentipode

* e
2024-02-20 15:21:31 -07:00
Ubaser
fa164f8726 Update Core (#25383)
add
2024-02-19 05:19:53 -07:00
brainfood1183
8bb07df2cb Origin Station Update 18.02.2024 (medbay update) (#25369) 2024-02-18 14:21:02 -07:00
Krunklehorn
f7d789e75d Updates to Origin (#24908)
Replaced medical's HM console with a CM console, added janitor equipment closet
2024-02-14 16:26:27 -07:00
deltanedas
6677995b63 saltern update (#25182)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-13 15:47:41 -07:00
Ubaser
6625cd7838 Update Core (#24862)
* add

* Update Resources/Textures/Parallaxes/attributions.yml

* sprite change

* address review

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-11 23:25:28 -07:00
Mangohydra
0071b095ab fixed fland cargo shuttle not having tiny fans (sorry) (#25095) 2024-02-10 14:00:28 -07:00
Emisse
f72d7ca06b meta update (#25077) 2024-02-09 03:58:01 -07:00
Emisse
5e02e1f7b5 marathon update (#25076) 2024-02-09 03:57:36 -07:00
Emisse
3b7d97984b fland update (#25075) 2024-02-09 03:57:21 -07:00
Emisse
20292cc738 box update (#25074) 2024-02-09 03:57:05 -07:00
deltanedas
ca9523f074 atlas update (#25071)
* atlas update

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-09 03:07:29 -07:00
Mangohydra
e789e9c956 Add New Fland Shuttle (#25016)
* Add New Fland Shuttle

* Update cargo_fland.yml
2024-02-07 01:49:06 -07:00
Emisse
c70c1a1d3a box update (#25012) 2024-02-06 23:41:46 -07:00
Emisse
934ec973ad meta update (#24952) 2024-02-06 17:38:32 -07:00
Emisse
870661f856 box update (#24813) 2024-02-01 05:56:48 -07:00