Commit Graph

244 Commits

Author SHA1 Message Date
Kyani 32719e2f99 Adds map: EmeraldStation (NSS Diagoras) (#26438)
* fleshed out engi and asteroid

* command work

* more department fleshing out: sec

* sec work

* perma work

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* med and dorms fleshing out

* sci and service fleshing out

* Update EmeraldStation.dmm

* APCs done + detailing

* Update EmeraldStation.dmm

* wire work

* more wire work

* wires and LIGHTS

* ATMOS DONE now onto DECOR

* AI/status monitors

* intercoms and newscasters

* Wall items and cameras!

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* moved the file to the correct area

* bugfixes, starting up the map

* refining the asteroid

* merge fixes

* logs of bugstomping

* more bugfixing

* bugfixing

* bugfixin

* trying to make the stupid lava work

* adds plasma vent for test

* more testing

* swapped file places

* vents work now!

* Update paradise.dme

* vent sprite update

* file corrections

* Asteroid MILLA changes

* adds a new MILLA atmos  type

* Build MILLA

* oopsie

* fixes

* removed testing code

* reverts map start

* reverts the atmos change

* respriting geyser

* comments

* Update code/__DEFINES/atmospherics_defines.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update geyser.dmi

* Update paradise.dme

* fixing past merges

* adds some missing items from merges

* reverting

* reverts changes again

* deleted unused file

* oops forgot nearspace areas

* Update code/game/objects/structures/plasma_geyser.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/lava.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/area/ss13_areas/engineering_areas.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/objects/structures/plasma_geyser.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/lava.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/objects/structures/plasma_geyser.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Lots of map fixes

* Update EmeraldStation.dmm

* trying to unfuck the milla merge

* removed station from dme

* fixes/small tweaks/suggested changes

* removed errant turret

* redid telecomms

* Update EmeraldStation.dmm

* rebuilding everything

* redoing security

* more sec work

* perma shaped up + more items

* renamed properly this time

* resetting atmos code

* more secwork and move papers off varedits

* more secwork + dorms + funeral services

* added new areas + pipe/wires/floors

* security electrified windows/wires/alarms/lights

* cameras, dorms pipes/ires/alarms/apcs

* merged

* disposals

* lots of wall things + added map datum for testing

* pipe fix for linter

* fiddled with maints

* minor maint edits

* fixes + maint work

* more bugfix

* even more bugfixing

* MORE nearspace fixing

* dumb nearspace fix

* Update code/game/objects/structures/plasma_geyser.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* a LOT of fixes + door access

* disposal pipe update  script

* oops linter fixes

* fixed viro button runtime

* finished maints + space decor

* removed hall light switches

* fixed solars areas

* removed errant lattice

* remove agent B from asteroid

* wall bump placement refining

* apc fix

* bugfixing

* minor maint change

* bugfixing

* burn tile on node fix

* changed official name

* bugfixing

* added genetics locker+figures

* bug hunting (buttons mostly)

* added firelocks. oops

* added temp webmap + bugfix

* Update emeraldstation.dmm

* new webmap. again

* added the perma tools

* nanomaps

* bug fixes, fixes, and more fixes

* more tweaks

* cable fix

* more bugfixing

* Update emeraldstation.dmm

* tiny fix

* fix AI sat turrets

* more bugfixing

* MORE bugfixing

* bugfix + ruins soundfile

* pipe bugfix

* fixed toxins pipes. junctions bad?

* swimwear :)

* remove errant QM gps

* rnd shutter button missing

* potato layering fix

* add bridge request console

* fix window tint in interrogation

* added some clothes

* nanomaps2, asset boogaloo

* modified an empty hall, added some perma cams, minor fixed

* forgot to save before push oops

* widens sci maint hall + bugfix

* gives theatre its autodrobe back!

* moved borg spawns

* moves nuke op default spot

* new asteroid mix + botany tweak

* adds cremator button

* new sign + moved pod + bugfixing

* cable fix

* engine, sci chem, and surgery tweaks

* more bugfixes and tweaks

* more tweaks

* adds a few windows back to robotics

* bar was missing pun pun!

* corrected misplaced atmos machines

* re-added the bathroom

* fixes atmos waste disposal injector

* modified mr potato

* changed bathroom area

* minor toxins tweak

* small wall decor tweaks

* removes errant lights

* removes errant opier

* LOTS of fixes/tweaks + adds CO2 to asteroid

* gave maint some boxes + cable fix

* duped brig lock

* adds masks to medbay storage

* adds missing gues passes

* cleanup from kitchen rework

* gives solars enough glass to complete it

* adds another defib to cryo pods

* makes asteroid sign fireproof

* perma maint now opens with virus + bugfixs

* bugfixing + adds missing holopads

* more holopads + bugfix

* adds some smoke vendors

* kitchen area tweak

* fixed errant rack

* rearranged/spread out cig vendors

* moved a cig machine again

* added RD tint button

* undid a brig area change

* removed errant posters

* added filing cabinets + bugfix

* maint morgue tray fix

* adjusted chapel + bugfix

* fixed palms + minor sec floor tweak

* adds forgotten magi and clown starts

* gave engi a shower

* reworked robotics + atmos bugfix

* geysers now work at 1/10 capacity when overpressure

* bugfixing + tweaked overrides/variables

* rework warden office

* bugfixes + adds some holopads

* added missing bio shutter

* more small tweaks

* adds RnD rework + gives mag some things

* fixed fabricators

* tweaked robo + added rnd server board

* added rnd backup circuit

* bugfixing

* bugfixing again

* bugfixing

* fabricator fix

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-09-13 18:18:25 +00:00
warriorstar-orion cfcd488d78 docs: Add social card preview. (#26719)
* docs: Add social card preview.

* derp
2024-09-08 17:42:03 +00:00
warriorstar-orion e68b61a649 ci: watch mkdocs.yml for changes to publish (#26690) 2024-09-05 18:40:11 +00:00
AffectedArc07 641069e6a6 Dev docs build rev 1 (#26682)
* Dev docs build rev 1

* Do this work

* Aight its done

* Last bit of safety
2024-09-04 18:14:28 +00:00
warriorstar-orion 1d538adc1d Centralize developer documentation. (#26485)
* Documentation.

* Documentation.

* Testing reqs update

* Post feature-freeze code of conduct updates

* spell checking

* Style Guidelines

* wrap

* link up, bring headers up one level

* wrap

* fix old link

* support github admonition syntax for mkdocs

* link rules, rename to guard clauses

* ffffucking vscode

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-09-04 16:43:33 +00:00
Burzah 9f0b3766a1 Changes the link to absolute (#26573) 2024-08-22 20:11:28 +00:00
Sean 1ad1a89daf Fix the fix to the PR template, emphasise the pre-approval list (#26543) 2024-08-19 09:00:44 +00:00
gl0ck 4eb6578782 adds a single R to the codebase (#26527) 2024-08-19 08:28:19 +00:00
Arthri e21b8ea4c3 Fix PR template link (#26516)
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
2024-08-17 19:52:28 +00:00
AffectedArc07 bd91a1b962 Obliterates the RSC (#26498) 2024-08-15 18:20:11 +00:00
S34N ba07ff139f -🧊- FEATURE FREEZE -🧊- (#26085)
* Revert "Feature Freeze announcement"

This reverts commit ec7a0bf431.

* Update README.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update CODE_OF_CONDUCT.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update PULL_REQUEST_TEMPLATE.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update PULL_REQUEST_TEMPLATE.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update CODE_OF_CONDUCT.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update PULL_REQUEST_TEMPLATE.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update CODE_OF_CONDUCT.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update CODE_OF_CONDUCT.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update CODE_OF_CONDUCT.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update PULL_REQUEST_TEMPLATE.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* Apply suggestions from code review

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

* farie

---------

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-08-08 15:13:43 +00:00
Matt e8a8939bd6 Creates a New Workflow for Adding Wiki Labels (#26066)
* Introduces a new workflow for wiki label

* Creates comment on success

* Authorized Users is now a List

* Removes commenting and changes list to repo var

* Changes repo variable name and removes checkout

* Changes to use GitHub ID
2024-07-11 18:05:33 +00:00
Arthri 32b73150ef Fix stale bot (#25904)
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
2024-06-29 17:54:50 +00:00
DGamerL d1dccb974e Updates CONTRIBUTING.md to better describe what an atomic PR is (#25779)
* A better description of what atomic is

* Update .github/CONTRIBUTING.md

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-06-28 02:54:15 +00:00
Charlie Nolan d3584b1d1c LINDA -> MILLA (#25328)
* LINDA -> MILLA

* Tiles now change their atmos mode properly.

* Fixed a bug that made walls generate supercold air when deconstructed/destroyed.

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Begone, var!

* MILLA -> milla

* Lint.

* More lint.

* Prevent negative/NaN atmos from spreading.

* Made fires start more reliably.

* Undef what the rest should not see.

* Enums are nice.

* Match LINDA better.

* Debugging verbs.

* Debug verb fixes.

* Labelled more lavaland stuff with ATMOS_MODE_LAVALAND

* Block superconductivity on a couple more things for Lavaland.

* Updated milla.dll

* Lavaland map fixes.

* Missed a spot.

* Begone, var! (again)

* Add libmilla_ci.so for continuous integration tests.

* Install/contributing instructions for MILLA.

* Directional plasmaglass windows on shuttles shouldn't stop protecting from heat after moving.

* Banish bad naming.

* Better naming and debug stats for SSair.

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Magic numbers and formatting.

* Don't screw up the temperature during reactions.

* Efficiency and readability.

* Fix hotspots.

* Removed redundant safety (MILLA will already output an error)

* Optimizations.

* oops

* TGS build script update.

* Change API of gas_mixture and how you get one from a turf.

* Get in there.

* so many vars

* MILLA binary updates.

* Lint

* Made MT cost more honest.

* Gave MILLA a read-only mode.

* More read-only vs synchronized mode work.

* Even more.

* Synchronize disposals.

* Updated a bunch of stuff to use SSair.synchronize or GM.synchronize.

* MILLA <3 Tracy

* lint

* cargo fmt

* more lint

* Test needed MILLA sync.

* Silence atmos machinery that's behaving as intended, but continue objecting to other potential failures to synchronize.

* Push new MILLA DLL

* Build MILLA

* Update PR instructions for MILLA.

* Add some fancy plasmaglass windows to the Lifebringers' ship.

* The golems remembered that they should insulate *all* their engines.

* First round of TM bugfixes.

* Build MILLA

* fix two lavaland ruin turf types

* bunch more maps

* fixes milla ci and makes the interesting turf verb better

* Solid turfs can no longer conduct heat (for now...)

* Made indoor tiles in beach and winter biodomes not lavaland air.

* Re-added random IT teleport, adjusted warning message

* Fixed a tinted window on Lavaland to be a plasglass window instead.

* Made firelocks and holofans heatproof

* Made RPD auto-wrench pipes if you have a wrench in your offhand.

* Runtime fixes.

* Made visuals update more reliably.

* Lint

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Build MILLA

* The Syndicate have installed tiny fans on their research base.

* The syndicate have figured out how to make plastitanium windows heatproof.

* This is getting out of hand. Now there are two of them.

* Un-break the auto-wrenching that I broke before committing.

* Build MILLA

* Build MILLA

* Massive MILLA refactor, assorted bugfixes.

* Build MILLA

* Explicit typing.

* Less sleeping/blocking.

* Build MILLA

* Yes, yes, this part can sleep.

* Build MILLA

* SSair reporting improvements.

* Build MILLA

* Please do not dock twice and splat yourself.

* Build MILLA

* Pls to not make SM go nuts.

* Build MILLA

* Build MILLA

* Added stricter lower bounds on plasmafire, fixing perpetually-burning SM.

* Build MILLA

* Lint

* Temporary logging, begone.

* Build MILLA

* Prevent hotspot strobing.

* Add in radiate_to_spess behavior.

* Build MILLA

* progress

* Compiling is good.

* bugfixes

* Progress.

* Ruins update.

* This one exists.

* Fixup temporary hotspots to last longer than one tick.

* Add/fix comments.

* Cut the slash.

* Fix test.

* No sleep for you.

* Build MILLA

* Prevent nested MILLA safety from runtiming.

* Build MILLA

* Runtime fix.

* Build MILLA

* Fix canisters not updating icon when gas contents change.

* Build MILLA

* Build MILLA

* Fixed an issue that made mechs very cold on environment air.

* Build MILLA

* oops

* Build MILLA

* Walls can make loud noises again.

* Build MILLA

* Fixes a rare runtime.

* Build MILLA

* Update .github/DOWNLOADING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Review suggestions

* Lint

* Build MILLA

* bound_mixtures now only contains mixtures that can be written

* Build MILLA

* Apply suggestions from code review

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Build MILLA

* Restore the original async behavior of pyro anomalies.

* Build MILLA

* Build MILLA

* Make the safety assertion in /datum/milla_safe safer.

* Build MILLA

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: GDN <Roanrichards1@Gmail.com>
2024-06-09 07:18:11 +00:00
AffectedArc07 0420e9a7fb Adds CI to verify maps are within 255x255x1 (#25369)
* Adds CI to verify maps are within 255x255x1

* Ooops platform agnostic

* Webedit to fight autoformat

* Time that shit

---------

Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2024-05-25 16:05:38 +00:00
S34N 2ac2dbca44 i swear to god (#25506) 2024-05-17 22:07:23 +00:00
S34N fa206c74b1 Tidy workflows (#25406) 2024-05-06 20:36:00 +00:00
Contrabang 0ace3d4351 Adds CI to remove duplicate definitions (#25218)
* the purge

* yes

* incorrect comment

* send it
2024-05-06 19:29:19 +00:00
Contrabang 0b04611f84 Adds CI for SQL versions (#25226)
* wow

* LETS GO

* e

* epic, LGTM

* spacing

* wow
2024-05-05 19:53:31 +00:00
S34N bf356eaadb Fix the workflows failing every comment (#25391)
* tgui rebuild

* fix this
2024-05-05 16:07:46 +00:00
Charlie Nolan 9726b23d2c Replace librust_g.so with milla.dll in CODEOWNERS (#25392)
* Replace librust_g.so with milla.dll in CODEOWNERS

* I know my ABCs, honest.
2024-05-05 16:05:33 +00:00
Charlie Nolan 2ab2fa76f3 Github workflow for building MILLA (#25386)
* Added a Github workflow for building MILLA with !build_milla.

* Uncomment a check that didn't work on a same-repo PR.

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
2024-05-05 15:02:17 +00:00
S34N a44ca02981 tgui rebuild (#25384) 2024-05-05 10:25:04 +00:00
DGamerL 6ea2f09570 Removes a rogue # (#25313) 2024-04-30 18:41:45 +00:00
S34N 6848ee8502 Updates readme, licence files (#25259)
* test

* more

* more stuff

* images

* more!

* sanity?

* details

* fix licences, update readme

* remove GPL disclaimer

* more docs

* wiki link

* spacing tweaks

* text change

* wording

* DM language reference

* Update README.md

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-04-30 00:12:49 +00:00
S34N 78e782dfcb skip nanomap when no changes needed (#25182) 2024-04-26 22:11:08 +00:00
S34N e615738e22 All your TGUI belong to us (#25250) 2024-04-24 19:42:12 +00:00
Luc 0c5fdaa57b Updates contributing guide regarding signals, removes SIGNAL_HANDLER_DOES_SLEEP (#24824)
* Updates contributing guide, removes DOES_SLEEP

* Update .github/CONTRIBUTING.md

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-04-24 19:40:45 +00:00
Charlie Nolan f12f75c652 Update CONTRIBUTING.md (#25235) 2024-04-21 23:47:32 +00:00
Burzah 224c488c40 CA Gang (#25233) 2024-04-21 22:54:06 +00:00
DGamerL 0a38123ff8 Adds me to CONTRIBUTING.md (#25232)
* I WILL conflict burza and funny

* Okaaaaaaaay fiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiine
2024-04-21 22:39:59 +00:00
Contrabang a95373f303 Adds CI to restrict types in a file (#24694)
* LETS GAMBLE!

* oops

* even more oops

* alright lets fuckin do it

* real names please

* comment

* Contributing.md update

* maybe someone will find this todo

* actually lets make it a define so people can't mistype it

* review

* changes
2024-04-19 18:30:13 +00:00
S34N 0b838dc3c4 [READY] BYOND 516 compatability (#25105)
* Preliminary changes for 516

* Also removes the goon folder

* Fixes a BUNCH of UIs

* update our things

* debug proc

* le maintainer verb

* fix strip panel

* browseroutput => chat_panel

* prettier, remove obsolete bat

* tidu tgui say css

* href purge

* 515 compat

* 515 compat 2

* more required chores

* comments

* fully working 515

* bungle

* correct this

* fixes 515 support

* prettier

* new CI

* fixes old href styles sneaking in

* update docs to reflect href changes

* more href fixes (thanks cdui)

* MORE href nonsense

* even more hrefs (seriously wtf)

* Update code/modules/admin/permissionverbs/permissionedit.dm

* error on fail

---------

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2024-04-15 18:49:50 +00:00
DGamerL b2275d1ce8 Changes all instances of pick(list(....)) to pick(....) (#25017)
* That's a lot of files

* More changes

* Removes mention

* Thanks to Funny for helping with the text
2024-04-12 11:54:33 +00:00
warriorstar-orion d52535a041 rename all station files and datums, consolidate types into one file (#24823) 2024-03-30 12:53:47 +00:00
S34N ff6af9bcb0 🙃 (#24875) 2024-03-29 15:16:21 +00:00
S34N f779546e5c Follow-up patch for "tidies other workflows and adds better logging" (#24864)
* null check is important in other languages too

* null check is important in other languages too

* 1/0

* simplify this

* readd user info

* remove this to test

* new name
2024-03-29 14:03:32 +00:00
S34N 89d6873c7e Adds workflow for automatic handling of stale PRs and issues, tidies other workflows and adds better logging (#24839)
* Tidy the code, better commenting when things go wrong

* text!

* stale labeller

* get the labels right

* avoid complications

* Update .github/workflows/merge_upstream_master.yml

* Update .github/workflows/merge_upstream_master.yml

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* makes the merge upstream thingy comment, and approve its generated workflows

* wow

* remove this, paradise bot reigns supreme

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-03-28 23:39:31 +00:00
S34N bb3800ca90 it was under my DAMN NOSE THE WHOLE TIME (#24832) 2024-03-26 23:06:36 +00:00
S34N 164ce333e4 one more time (#24831) 2024-03-26 22:44:20 +00:00
S34N 3954100889 Use a github app token, not the default token, to run !merge_upstream workflow actions (#24822)
* Use GitHub App Token instead of built-in token

* the important token location, and simplify

* nanomap render

* Update .github/workflows/merge_upstream_master.yml

Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>

* further updates

* formatting

---------

Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
2024-03-26 22:19:30 +00:00
Arthri 9efaed6397 Subminute Upstream Merge & Add Comment for Access Denied (#24759)
* Update action

* Remove unintended permission

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
2024-03-23 19:28:10 +00:00
Arthri 9eca2f5c6d Allow OP to !merge_upstream (#24724)
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
2024-03-21 10:19:27 +00:00
S34N 002363099d Restrict !merge_upstream workflow to dev team and PR author (#24711)
* restrict !merge_upstream to PR author or repo members

* proper syntax please
2024-03-20 23:13:57 +00:00
S34N be9a8c8c14 Fix TGUI deconflict hooks, makes them work on windows (#24686)
* Lets us install tgui merge drivers on windows

* test this

* gamer mode

* debug

* do it like this

* test

* test this

* stop it being weirdly relative

* more relative fixes

* try cat

* indentation

* update CI stuff to cache

* correct this

* yarn

* yarn consistency

* do we even need to do this? (no we don't)

* properly cache yarn deps in ci

* Why do we even have that step

---------

Co-authored-by: github-actions <github-actions@github.com>
2024-03-20 20:10:29 +00:00
Contrabang 85792c042b [s] Adds Contrabang to Commit Access (#24707)
* updates contributing.md

* Empty-Commit
2024-03-20 20:03:37 +00:00
S34N 5c3cf02eaf Adds execute perms to the repo-bundled python script (for real this time) (#24654)
* ci for updating PR

* fix python not executing

* do it again

* we added the perms but in the wrong place (also python fixes)

* fix for real (real)
2024-03-17 13:46:43 +00:00
S34N 5216a7853f Adds execute perms to the repo-bundled python script (#24651)
* ci for updating PR

* fix python not executing

* do it again
2024-03-16 23:54:00 +00:00
S34N e113fa66e9 ci for updating PR (#24649) 2024-03-16 22:58:00 +00:00