cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 06:04:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 10 Branches 2 Tags
dev-docs-readme
Commit Graph

98 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
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
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 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 78e782dfcb skip nanomap when no changes needed (#25182) 2024-04-26 22:11:08 +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
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
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
S34N 01a150a3dc base merge queue CI stuff (#24571) 2024-03-11 17:11:36 -04:00
Contrabang e32544e599 #undef is now required for all file defines (#24091) 
* CI

* undef

* hooooly crap

* yeah

* false by default

* fixes

* alright, there we go

* oops lmao

* lol, lmao even

* proper programming

* fix

* losin my mind

* oops

* yeah coloring

* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
 2024-03-11 14:03:30 -04:00
Contrabang 27c70cde0a Upgrades SpacemanDMM + Dreamchecker CI (#24247) 
* update to suite 1.8

* lets go annotate dm

* okay lets not fuck up

* testing commit

* return it to the natural state
 2024-03-01 23:19:59 +00:00
warriorstar-orion 43b3bb0e44 forbid in-DMI icon state name dupes with CI (#22734) 
* forbid in-DMI icon state name dupes with CI

* remove final icon dupes

* use shodancoat item_state
 2024-03-01 13:12:21 +00:00
Arthri b4dd74689e Fix misleading CI error when linting fails (#24200) 
* Fix misleading CI error

* Intentionally make /tg/ui build fail

* Revert "Intentionally make /tg/ui build fail"

This reverts commit cb7bbe3e6d.

* Intentionally trigger dreamchecker

* Ignore exit code

* Fix error disappearing

* Revert "Intentionally trigger dreamchecker"

This reverts commit a2187b7ce9.

* Undo autoformat

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
 2024-02-17 13:34:34 +00:00
dependabot[bot] 3882a59ee0 Bump actions/cache from 3 to 4 (#23890) 
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-01-22 22:45:44 +00:00
AffectedArc07 223d980e02 Puts multi instance stuff behind a define (#23666) 2024-01-14 12:29:12 +00:00
dependabot[bot] 2c85645444 Bump actions/setup-python from 4 to 5 (#23530) 
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-12-12 21:16:14 +00:00
S34N 77847d0351 test further CI fixes (#23526) 2023-12-11 17:48:53 +00:00
AffectedArc07 4ccd0b453f Redoes CI + removes RUSTG from the repo (#23490) 
* Redoes CI + removes RUSTG from the repo

* We need these

* Split these out

* Why does every CI PR end like this

* Agh

* Fun

* Even more shit

* Try this

* Lets bump this
 2023-12-08 17:05:08 +01:00
AffectedArc07 2533138080 Temporarily disables redis in CI (#23450) 
* Temporarily disables redis in CI

* Safety
 2023-12-02 16:15:14 +00:00
S34N af5a06e729 514 is dead, long live 515 (#22529) 
* 514 is dead, long live 515

* YES
 2023-10-17 19:46:42 +01:00
warriorstar-orion 0ac224db0e add CI check for DMI conflict markers (#22494) 
* add CI check for DMI conflict markers

* helps to do the thing
 2023-09-20 12:46:43 +01:00
dependabot[bot] f1082f2ffe Bump crazy-max/ghaction-github-pages from 3 to 4 (#22366) 
Bumps [crazy-max/ghaction-github-pages](https://github.com/crazy-max/ghaction-github-pages) from 3 to 4.
- [Release notes](https://github.com/crazy-max/ghaction-github-pages/releases)
- [Commits](https://github.com/crazy-max/ghaction-github-pages/compare/v3...v4)

---
updated-dependencies:
- dependency-name: crazy-max/ghaction-github-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-12 18:25:52 +01:00
dependabot[bot] 0673266a06 Bump actions/checkout from 3 to 4 (#22248) 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-07 19:29:45 +01:00
dependabot[bot] 359c5545d2 Bump supercharge/redis-github-action from 1.6.0 to 1.7.0 (#22247) 
Bumps [supercharge/redis-github-action](https://github.com/supercharge/redis-github-action) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/supercharge/redis-github-action/releases)
- [Changelog](https://github.com/supercharge/redis-github-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/supercharge/redis-github-action/compare/1.6.0...1.7.0)

---
updated-dependencies:
- dependency-name: supercharge/redis-github-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-07 19:29:26 +01:00
warriorstar-orion 448c5c9d48 update autodocgen to ubuntu 20 (#22006) 2023-08-25 16:49:52 +01:00
Contrabang fe0a7c5ec3 Adds an illegal files CI to check the main dme (#21818) 
* adds illegal files CI to dme (this will fail)

* im only slightly mentally challenged

* and now magically, the CI works

* better comment? maybe?

* includer -> included (sorry for commit spam)

* lewc review

* warriorstar review

* give em a total number too, for ease of use

* i think this is better wording

* lewcc review

* warriorstar review
 2023-08-12 18:43:29 +01:00
dependabot[bot] 28aa2d11db Bump supercharge/redis-github-action from 1.5.0 to 1.6.0 (#21877) 
Bumps [supercharge/redis-github-action](https://github.com/supercharge/redis-github-action) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/supercharge/redis-github-action/releases)
- [Changelog](https://github.com/supercharge/redis-github-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/supercharge/redis-github-action/compare/1.5.0...1.6.0)

---
updated-dependencies:
- dependency-name: supercharge/redis-github-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-02 17:54:44 +01:00