Commit Graph

1780 Commits

Author SHA1 Message Date
metalgearsloth
d66ad739ee Fix godmode serialization (#27427)
IDK
2024-04-28 14:30:39 +10:00
Boaz1111
8af23749a1 Cluster med refactor + un-abandoning of surgery room (#27293)
* done

* cryo tweaks

* fixes error
2024-04-26 02:01:21 -06:00
IProduceWidgets
290a984c90 Oasis small tweaks (#27335)
do the easy reviews
2024-04-26 02:01:07 -06:00
Nemanja
161fd6c83c Mega Antag Refactor (#25786)
* Mega Antag Refactor

* last minute delta save

* more workshopping

* more shit

* ok tested this for once

* okkkkk sure

* generic delays for starting rules

* well darn

* nukies partially

* ouagh

* ballin' faded and smonkin wed

* obliterated the diff

* Spread my arms and soak up congratulations

* I've got plenty of love, but nothing to show for it

* but there’s too much sunlight
Shining on my laptop monitor, so I
Can’t see anything with any amount of clarity

* ok this junk

* OOK!

* fubar

* most of sloth's review

* oh boy

* eek

* hell yea!

* ASDFJASDJFvsakcvjkzjnhhhyh
2024-04-25 11:31:45 +10:00
deltanedas
d797e3753f saltern bar stool (#27263)
saltern stool

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-24 13:40:54 -06:00
Hannah Giovanna Dawson
f059714a75 SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-04-21 12:09:26 -04:00
IProduceWidgets
7b0b894e44 Add map Oasis (#25736)
* Add map Oasis

* integration test fix

* psych job

* 1984 an invalid component

* address reviews

* address reviews, touch ups.

* tiny feexes

* move a tree

* Actually put it in the active maps pool.

* minor tweeks

* tweek some door accesses.

* add extra lawyer, make evac the right docking arrangement.

* Address the small things, fix cryopods, make perma huge.

* Fix some small things in the new perma.

* Improve perma spacing resiliancy... maybe.

* burn the invalids

* Pray to the Sloth gods that painters arent cooked.

* rearrange some buttons

* fix fax names and add a genedrobe.

* Housekeeping

* fix some stuff I thought I already fixed

* wood benches

* Some under door tiles, a couple missing decals.

* one pipe got brokey. feexit!

* astrograsses and lathe to cargo

* N2 lockers, minor things.

* cap laser to case

* GridFill the briggle so it feels better. Some other minor things

* name the Briggle correctly
2024-04-20 23:59:12 -06:00
Ubaser
01ce407019 Update Core (#27195)
* add

* fix invalid
2024-04-20 23:58:23 -06:00
Ghagliiarghii
380ace4ef0 Fixed potential duplicate engraved lighter steal objective (#27177)
* Fixed potential duplicate engraved lighter steal objective

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

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

* Implement pigeonpeas' suggestion

* Also replaced the one if the vending machine, unsure if this vending machine is used or if vended items retain their fills, but figure can't hurt

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-04-21 07:32:24 +10:00
Verm
089c9cb967 You can bless more containers with a bible (#26526)
* Made more things blessable

* Removed junk

* Remove whatever that was

* Make bowls blessable

* New mixablesolution component, converted everything to work with it

* Fix minor mishaps

* Fix extra spaces in bottle yml

* Fix last extra space, fix bottle havign the wrong solution name

* Remvoe unneeded event(I think), fix alcohol bottles not being mixable

* I missed cans
2024-04-20 16:16:55 +10:00
Aexxie
fa9abbaff4 No More Bartender Incendiaries on Meta (#27142)
deleted bartender's incend
2024-04-20 11:06:21 +10:00
deltanedas
4509235604 saltern update (#27071)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-18 16:05:38 -06:00
deltanedas
71d5d2a563 atlas update (#27070)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-18 16:05:29 -06:00
Ed
e82034c16b Component of planet initialization on the map (#26510)
* no cl no fun

* DevPlanet

* fix europa?

* Update Content.Server/Station/Components/StationBiomeComponent.cs

* Update Content.Server/Station/Components/StationBiomeComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-18 21:27:54 +10:00
Emisse
da136826e7 box update (#27069)
* box update

* argh
2024-04-17 16:01:24 -06:00
deltanedas
46733616df atlas artifact update (#26506)
atlas update

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-17 15:36:29 -06:00
deltanedas
d08600240f saltern update (#26507)
* saltern update

* update atmos too

* run fixgridatmos

* fix power outside botany, fix botany air alarm

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-17 15:36:18 -06:00
Emisse
f2ed508562 meta update (#27067) 2024-04-17 15:25:03 -06:00
Emisse
e0589a1350 fland update (#27064)
* fland update

* n2 lockers
2024-04-17 15:08:41 -06:00
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