Commit Graph

156 Commits

Author SHA1 Message Date
Venuska1117
ede086a241 ... (#21560) 2023-07-23 22:25:55 +01:00
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769)
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
2023-07-21 15:56:00 +01:00
AffectedArc07
8d7e066471 Adds OpenDream as a CI lint (#21099)
* Initial Commit

* Makes the CI work (maybe)

* Of course CI has a hissy fit

* Actually fixes the codebase

* Oops 1

* Tweaks

* oops
2023-07-18 20:50:31 -05:00
warriorstar-orion
edcaaf4241 Port check_grep.sh from an increasingly complicated shell script to Python. (#19875)
* Port check_grep.sh from an increasingly complicated shell script to Python.

* Exclude dmdoc-formatted multi-line comments from whitespace check

* Add comment exception for both WS rules

* Fixed mixed tab/space regex.

* hate hate hate hate

* Add doctests to preserve my sanity

* Remove checks involving newlines.

* Add back newline-involved tests. Cry.

* Several large-scale changes.

- Remove all the map-related changes for now, in order to get the
  code formatting changes in sooner and prevent more issues from leaking
  in while the PR issues are burned down.

- Flip the method for processing files. Instead of trying to sort errors
  by type, running over each file for each error, I'm simply breaking
  from the original output format and returning a lint-like set of
  errors. In this design, each file is opened, the checks are run, and
  the file handle is reused for each check.

- Standardize failures so that the filename, line number, and message
  can all be retrieved and formatted nicely for stdout.

- Compile regexes. The consensus seeeeeeeems to be that there's a
  negligible difference in performance when compiling regexes but
  there's a possibility that running them a lot of times may be faster,
  and I could actually time it, but ugggggggh.
2023-07-07 17:31:05 +01:00
Edan
a168bf68ac Logs wizard spell names instead of initialisms to the DB (#21136)
* improve wizard feedback data

* review 1

* readability improvement
2023-06-05 18:30:36 +01:00
AffectedArc07
b5a9377683 Updates the tracy replay link (#21006) 2023-06-05 11:43:10 +01:00
Contrabang
3f87165a03 CI now bans files with the same name (PART 2) (#21051)
* CI change

* world.dm

* .dme world.dm

* subsystem renaming

* .dme for subsystems

* ai_laws.dm

* armor.dm

* emote.dm

* logging.dm

* spell.dm

* air_alarm.dm

* crew.dm

* decal.dm

* emissive_blocker.dm

* footstep.dm

* spawner.dm

* fire.dm

* carbon.dm

* living.dm

* mob.dm

* movement.dm

* thermal_drill.dm

* plasmamen.dm

* lavaland.dm

* chaplain.dm

* lightning.dm

* magnet.dm

* mimic.dm

* wizard.dm

* morph.dm

* vampire.dm

* click.dm

* self.dm

* radiation_storm.dm

* airlock.dm

* autolathe.dm

* mulebot.dm

* nuclearbomb.dm

* particle_accelerator.dm

* smartfridge.dm

* syndicatebomb.dm

* vending.dm

* wires.dm

* sound.dm

* mining.dm

* syndicate_space_base.dm

* monkey.dm

* guardian.dm

* bomb.dm

* standard.dm

* nuclear.dm

* pinpointer.dm

* access.dm

* departments.dm

* job.dm

* science.dm

* buttons.dm

* cloning.dm

* igniter.dm

* wishgranter.dm

* atmos_control.dm

* message.dm

* power_monitor.dm

* mecha.dm

* combat.dm

* mining_tools.dm

* meteors.dm

* spiders.dm

* contraband.dm

* aliens.dm

* uplinks.dm

* voice.dm

* intercom.dm

* lights.dm

* robot_items.dm

* mineral.dm

* dice.dm

* extinguisher.dm

* paint.dm

* signs.dm

* staff.dm

* smokebomb.dm

* boxes.dm

* random.dm

* janicart.dm

* statue.dm

* cargo.dm

* asteroid.dm

* headslug.dm

* fulton.dm

* atmospherics.dm

* pump.dm

* corpse.dm

* oldstation.dm

* gps.dm

* preferences.dm

* clothing.dm

* ears.dm

* glasses.dm

* boxing.dm

* color.dm

* renames ninja gear files

* recipes.dm

* error_handler.dm

* anomaly.dm

* floorcluwne.dm

* undead.dm

* overmind.dm

* shield.dm

* bottle.dm

* organ.dm

* piano.dm

* plasma_fist.dm

* language.dm

* mob_defines.dm

* mob_helpers.dm

* damage_procs.dm

* _defines.dm

* empress.dm and queen.dm

* brain.dm

* organ file renaming

* subsystems.dm

* constructs.dm

* bot.dm

* pet.dm

* nature.dm

* magic.dm

* colors.dm

* drugs.dm

* medicine.dm

* toxins.dm

* shuttle.dm

* surgery.dm

* moves a bunch of define files

* traits.dm

* names.dm

* other_mobs.dm

* flags.dm

* some final define files

* well turns out contractor_pinpointer.dm was  taken

* I forgot to remove this file

* how in the hell did this get unticked

* I DID INCLUDE IT, but there was a "w" there

* swaps the world definitions

* camera renamed to SScamera

* examine -> alien_examine
2023-06-02 14:30:17 -05:00
Tobias Berger
10f6187ffc Fix render_nanomaps action (#21151)
* Fix render_nanomaps action

Use up-to-date VM and updated SpacemanDMM with modified source

* Revert changes to SpacemanDMM/nanomap-renderer

Note that during map generation this will cause errors in the form of:
```
error: #error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update.
error: #error You need version 514.1554 or higher
```
2023-05-23 09:23:52 +01:00
S34N
9c17e6e61f Fixes nanomap rendering (#20724)
* fix

* Update tools/github-actions/nanomap-renderer-invoker.sh

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

---------

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2023-03-27 21:31:52 +02:00
AffectedArc07
b34e8fa301 [READY] CI now bans files with the same name (#20195)
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
2023-02-04 16:33:41 -06:00
S34N
802408a923 Cere-station [100% free lag edition] (#19951)
* change da world

* compile, thanks

* Update cere.dmm

* Update cere.dmm

* ready for test

* use the proper name please

its CERE not ceres.

* stops shuttle from forcibly docking with podbay

* things are now different

Landmark update for job spawns.
More hardsuits in EVA, engi, and atmos.
Disaster counters properly added.
Vault is now more spooky.
Gamma armoury moved to below gulag shuttle.
Sleeping rooms replaced with arcade and swimming pool.
Captains ERP nest deleted.
Tcomms now looks like it was designed by a functional human being.
Mining doesn't need a weird glass box.
Shuffled docking ports at arrivals.
Windows are now reinforced windows.
Mr changs has arrived.

* disposals functions now

* now with 50% more air

* gamma armoury doesn't attempt to become one with gulag shuttle

* disposals net is airless, vault is enclosed in some rock

* standard number of escape pods

* slight fixes

* more bugfixes

* lighting fixes

* divided hallways, added psych office, more cams

* fire alarms, shutters, and fixes

* temporary DME edit to set cere as default map

* fixed shuttle runtime

* this compiles and runs locally, please CI

* fixes hidden double pipe

* more double pipes

* more vents and scrubbers, morgue body delivery

* tweaks to secbot pathing

* various QoL changes

* Medbay expansion, med+arrival maints expansion.

* the definitive air alarm update, and more!

* Departmental emergency EVA suits, signage, tweaks.

* 2 Cryodorms added (oops). Asteroid sound updates.

* Borg cryo, shutters correctly rotated.

* Supply shuttle edit. I like joining the map queue.

* minor fixes, grav gen isolation.

* minor fixes

* Disposal fixes, lighting adjustment

* SabreML feedback changes

* More minor fixes

* More fixes

* NSS Farragus

* (most) floors turn into asteroid sand, not spess

* reverted random file edit, fixed mr teeny

* minor fixes

* big bombs can breach asteroid areas

* Asteroid plating exists, did you know? I do now!

* camera network pass

* walls become sand too on destruction

* lighting pass

* implements feedback, dramatically reduces ores

* yeets ores entirely, sci break room added

* roundstart pads, more solars, bigger departures

* runtimes

* mining resistant rock

* variable names are important

* AoE KA doesnt affect rocks

* actually fix AoE stuff

* now with 1000% more bats

* no sandy cables, a brig exit chute, more head ssu

* mech drills are not pickaxes

* proc rename, perma window, faster sapce bridges

* Brig rework

* robotics changes

* More sci edits

* Rotayshun changes

* dme edit

* Delete cerestation.dm

begone, thot

* temp edit so it loads cere as default

* merge conflicts begone

* decal purge

* map repipe

* removes under-wall pipe adapters

* shuffled maint areas

* dirt purge

* longest bridge rework

* fixes

* PPI feedback

* kitchen does, in fact, need air

* permabrig tweaks

* restores cc changes

* merge part 2

* tag purge

* secret clown HQ got me shook

* SQUASHENING

* solar shuffle

* directional consoles

* remove TM edits due to rotation

* merge conflict part 2

* pod pilot deletion

* cold rock, window tint fixes, etc.

* further red rocks

* further tweaks

* more standardising

* robotics redo

* carpet time

* CI update for cere

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* more squash, corridor cam removal, etc.

* light switches

* minor fixes

* temp cere default

* FOODCART!

* fixes

* no airless no more

* space_hall

* compat pass 1

* make it work

* more changes

* slimmening

* air alarm tweak

* TM commit

* ci tests

* final CI changes?

* squash. squeeze, optimise

* wall vent

* disposals fix, more squeezing

* bugfixes

* false walls

* bedroom culling

* edits and fixes

* tweaks

* changes

* det window

* further tweaks

* Revert "TM commit"

This reverts commit 9e8814937f.

* More TM only changes reverted

* fixes smoothing with falsewalls

* denth changes

* the airlockenning

* cicicici

* CICICICI

* further tweaks

* further tweaks

* reverts weird sand behaviour code from ages ago

* oops

* universal adapter my beloathed

* nanomap moment

* webmap

* cere nanomap

* feedback updates

* updates

* airlock tweaks

* vents and tweaks

* solars moment

* triple APC fix

* south of where?

* airlock helpers

* disposal flap purge

* outpost monitor with actual real networks?

* tweakeroni

* fixes

* fixes

* tweaks

* fixes

* medbay improvements

* power and flaps

* changes

* aa changes

* fixes

* more fixeronies

* fixes!

* reversed

* chemicals

* chem tweaks

* fixes

* shuttle fixes

* holopad pass

* editseditsedits

* lightslightslights

* door

* /obj/machinery/computer/security/telescreen/entertainment

* sonic underground

* actual sonic reference

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Tsrc

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-01-17 22:23:09 +00:00
dependabot[bot]
e2d508fe42 Bump pillow from 9.0.1 to 9.3.0 in /tools (#19749)
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.1 to 9.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.0.1...9.3.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-29 16:22:42 +01:00
AffectedArc07
fb41b39a77 Restores mapmerge CLI scripts (#19906) 2022-12-13 16:51:16 +00:00
AffectedArc07
a69a67301e Adds BYOND-Tracy as part of the repo (#19839)
* [DNM] Adds BYOND-Tracy as part of the repo

* And its ready

* Update code/_compile_options.dm
2022-12-13 16:46:30 +00:00
S34N
b66fb2448c 515 compat 2, ./proc/ boogaloo (#19688)
* 515 compat 2, ./proc/ boogaloo

* ASYNC

* further CI checks

* aa

* lol escape this / pls

* more of them

* no idea why but this is scuffed so
2022-11-15 22:06:30 +01:00
S34N
aaf7d3b6e3 CI check for old style procrefs, tidies some that slipped in (#19649)
* CI_procref

* tidy these

* exclude the one place we will permit this
2022-11-09 21:13:08 +01:00
warriorstar-orion
eb54090eeb Add untick file check to CI. (#19618)
* Add untick file check to CI.

* Time for some caveman debugging

* Software's real neat
2022-11-06 12:24:47 +00:00
warriorstar-orion
274ef027dc Add required configuration for automated map merge script. (#19484)
* Update merge_driver script.

* Actually tick and compile new files.

* Improve marker description.
2022-11-05 15:58:35 +00:00
warriorstar-orion
091d5afbd9 Add CI script for verifying tickedness of files. (#19590) 2022-11-05 15:30:16 +00:00
AffectedArc07
23c3a6c252 Attempt to multibuild on CI (#19571)
* Attempt to multibuild on CI

* I cant space in bash

* AAAAAAAAAAAAAAAAAAAAAA

* Im gonna bash my head in

* ..
2022-11-03 18:04:09 +00:00
S34N
ce7d68fcf1 Fixes draggable bushes, sprite oversight [MAPPING CHANGES] (#19351)
* no drag the bush, and other tweaks

* im smart

* mapping changes

* delete
2022-10-19 16:22:41 -05:00
S34N
8ef5c698d6 New newscaster sprites [MAPPING CHANGES] (#19252)
* map

* PR number

* master maps

* re-apply changes

* manually stop that shuffle
2022-10-15 11:30:56 -05:00
AffectedArc07
4ef0c1c84c Some more stats logging (#18700) 2022-08-09 18:45:57 +01:00
Sirryan2002
f2813a6730 Complete Library Overhaul Part 1 (#17832)
* first edits

* more commits yay

* more changes

* Update paradise.dme

* changes

* more edits

* more edits

* changes

* more changes

* changes

* more stuff

stuff

Update tgui.bundle.js

* FUCK

* Many UI changes

* Update Lib Computer UI and Correct Map Issues

* squashed commits :)

Guts Old Book/Manual Code and Reworks it
final (almost) touches

* this should pass tests now

* fixes random ruin having a removed object

* adds review suggestions

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

* squashed commits :)

update schema
adds python requested changes
implements proper python & sql scripts
applies some requested changes + minor fixes
bump SQL version to 40

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* applies requested changes from code review

* lets pass some tests today

more fixes

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* more requested changes fulfilled

* should fix map issues + a couple other things

* fixes & sanitization stuff

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* updates UI and implements more requested changes

* mother of bug fixes & UI cleanup

* removes unused code

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* fixes

* adds GC checks

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* requested changes + TGUI Cleanup and Styling

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-09 14:55:12 +01:00
S34N
da085d7168 initial (#18249) 2022-07-07 17:49:20 +01:00
S34N
4f5c3376e3 Updates tools to include mapmerge hooks and merge drivers, plus more (#18034)
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging

* mapping guidelines update

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* aa review

* these somehow got ignored? force adding

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-06-21 23:53:19 +01:00
S34N
1910d4cb37 Removes instances of rusty turfs (#17980)
* removes instances of rusty turfs

* and this
2022-06-16 20:52:06 +01:00
moxian
b000bd2a88 Add eslint settings to vscode config (#17680)
* Add eslint settings to vscode config

* Lint vscode settings as json5

* A tiny bit better argument parsing, oops
2022-04-29 13:07:46 +01:00
dependabot[bot]
d3ee2eb11a Bump pillow from 9.0.0 to 9.0.1 in /tools/mapmerge2 (#17474)
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.0.0...9.0.1)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-11 23:47:45 +00:00
AffectedArc07
95ce462b14 Completely refactors Karma (#17447)
* Refactors Karma

* I FELL VICTIM TO MY OWN CI

* Update code/modules/client/client_procs.dm

* Update SQL/updates/31-32.py

* Mochi tweaks

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2022-03-08 22:14:05 +01:00
S34N
fda697e2b5 [MDB Ignore] Makes maps comply with "[dir]_bump" standards (#17259) 2022-01-17 21:18:00 +01:00
dependabot[bot]
dc7b8bcc8f Bump pillow from 8.3.2 to 9.0.0 in /tools/mapmerge2 (#17320)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-13 08:11:30 +01:00
AffectedArc07
62aabe7401 The end of an era 2021-10-30 10:47:25 +01:00
AffectedArc07
e643684a4c aaaaaaaaaaaaaa 2021-10-13 22:43:12 +01:00
AffectedArc07
61ddfa6520 im falling apart 2021-10-13 22:40:53 +01:00
AffectedArc07
3392a45ed9 h 2021-10-13 22:34:12 +01:00
AffectedArc07
cef5cc0e2a Update tools/loadout_converter/loadout_converter.py 2021-10-09 20:44:37 +01:00
AffectedArc07
f59cbdf70e Rewrites loadout converter python script 2021-10-09 20:43:22 +01:00
SabreML
bc739c353d Loadout DB Storage Refactor (#16453)
* `display_name` -> Typepaths V1

* Loadout display name capitalisation

#15857

* Review 1, plus json fixes

* (Hopefully) final tweaks

* Styling nitpicks

* Extra tweaks because why not

It never caused a runtime, but the `?.` is just in case.

* Deconflicting

* Warning comment

* Whoops

Typing faster than my brain
2021-10-09 19:35:15 +01:00
AffectedArc07
c358a20498 Moves pAI saves to the DB 2021-10-04 19:15:53 +01:00
AffectedArc07
c7b10e9fd9 Makes us use release dmdoc 2021-09-13 22:01:40 +01:00
dependabot[bot]
1548d5ec04 Bump pillow from 8.2.0 to 8.3.2 in /tools/mapmerge2 (#16656)
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.2.0 to 8.3.2.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.2.0...8.3.2)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-08 20:19:51 +01:00
S34N
606bd484ac Merge branch 'master' into AI_announcer_new 2021-08-05 09:53:03 +01:00
SabreML
5577960583 Map conflict fixer markdown (#16450) 2021-07-29 15:19:11 +01:00
AffectedArc07
bede78aeff Removes table prefixes 2021-07-26 17:21:24 +01:00
variableundefined
d91c8ba479 Merge pull request #15980 from AffectedArc07/toml-config
[READY] Converts configs to use TOML + Configuration refactor
2021-07-25 08:26:29 -04:00
S34NW
a5cc1f325a Merge branch 'master' into AI_announcer_new 2021-07-20 17:39:30 +01:00
SabreML
036a69fea4 Removes pixel_* = 0 and tag = "icon*" from the map files (#15438)
* Pixel Removal

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Fix

Why is that even there?

* Fix

Apparently I did the regex stuff in the wrong order for `Lavaland.dm`. Whoops

* Unit tests

* Mother of all map edits

* `tag = "icon` purging

* No area check

Far too much code debt for this PR to cover, but soon...

* At request

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-14 23:07:12 +01:00
AffectedArc07
efed543f47 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-13 14:15:07 +01:00
dependabot[bot]
0c66d089a2 Bump pillow from 8.1.1 to 8.2.0 in /tools/mapmerge2 (#16138)
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-10 16:06:42 +01:00