26 Commits

Author SHA1 Message Date
Morb0 f990964b03 Add Audio to Secrets copy 2025-06-20 12:55:30 +03:00
Morb0 4000b48a23 Remove Secrets from git submodule 2024-07-05 03:21:05 +03:00
Morb0 75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Communications/CommunicationsConsoleSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
2023-10-11 16:56:19 +03:00
iacore 21247fb642 cleanup: remove TargetingDoll-related code (#20866) 2023-10-09 16:40:17 -07:00
Morb 6e4608bf4f [Secret] Add ghost themes (#1479) 2023-10-03 01:20:10 +03:00
Morb0 5e8d55caf8 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
2023-05-13 10:39:34 +03:00
Vera Aguilera Puerto e94d36f51a Add nix flake with development environment shell and direnv. (#16047)
Use with nix-direnv, `nix-shell` or `nix develop`.
2023-05-09 17:28:12 +02:00
Morbo 50c80d2bd2 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Nuke/NukeComponent.cs
#	Resources/Prototypes/Voice/disease_emotes.yml
2023-04-29 14:53:32 +03:00
pofitlo 447f08b10a add new music for nuke (#15035) 2023-04-29 18:57:59 +10:00
Morb fdfafd06e7 Add evil twin + Secrets (#823) 2023-02-18 23:49:55 -08:00
Zoldorf d83a5162ad Adds SS14 DocFX (#7216) 2022-03-21 00:00:51 -06:00
Jack Fox fd94308d31 Add VSCode build files (#6689) 2022-02-13 15:35:50 -07:00
Sam Weaver 13b99e4172 Gitignore images generated by Content.MapRenderer (#6261) 2022-01-21 13:43:17 -07:00
SweptWasTaken 7330ed5087 Adds desktop.ini to .gitignore 2021-05-10 00:07:45 -07:00
20kdc 2f01d7899f Mapping merge driver: continued (#2803)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-02-06 23:56:40 +01:00
partyaddict d77dea6498 Adds windows image file caches to .gitignore (#836)
Shoutouts to Windows 7 Users
2020-04-21 12:32:46 +02:00
Pieter-Jan Briers 812654fe32 Add VSCode extension recommendations 2020-01-19 19:13:34 +01:00
Pieter-Jan Briers 69ee137cea Add .directory to gitignore 2019-01-23 15:29:39 +01:00
Pieter-Jan Briers 41bda76980 Minor stuff: (#58)
* Minor stuff:

* Making a file called DISABLE_SUBMODULE_AUTOUPDATE in BuildChecker/ makes it not always run git submodule update.
* Added .mypy_cache to .gitignore.
* Made default platforms x64 (from Any CPU).

* Make git hooks +x.
2018-04-19 20:15:36 +02:00
Pieter-Jan Briers 6704245a41 The Wait Is Over. (#49)
* Move submodule to Godot

* Update submodule AGAIN.

* Update project files.

* Remove WearableAnimatedSprite from prototypes.

* Remove content repo resource copier.

* Update submodule.

* Fix resource handling.

* Content.Client compiles by commenting out hands GUI.

* Update submodule.

* Fix prototype textures and update submodule.

* Update Submodule.

* Update submodule SOME MORE!

* Random WiP shit I guess

* Make omnisharp not choke on buildchecker.

* Update submodule.

* Highly WiP broken HandsGui code.

* Ok maybe let's not insult omnisharp.

* Fix annoying Omnisharp warning.

* Update submodule.

* Update submodule.

* Hey I forgot to push this but it didn't conflict!

* Fix hands GUI on godot.

* Update submodule.

* Obligatory submodule update.

* Work on exports.

* Work on exports.

* Update submodule.

* Update submodule.

* Fix dumb case mismatch between content and engine

* work pls.

* This maybe.

* Now!

* Update submodule.

* update submodule.

* Some WiP work on exporting aaah.

* OK READY FOR THE BUILDS SERVER.

* Probably should've made those commits in a different order.

* DO THE THING

* update submodule.

* Updates for effects system.

* Update submodule.

* Make file/line numbers show up on Windows Godot.

* Set submodule to master.
2018-04-07 15:31:38 +02:00
Pieter-Jan Briers e569eb276e package_release_build mac support. 2017-08-14 15:05:39 +02:00
PJB3005 23381d936f Fix package build script deleting build output. 2017-08-09 13:18:44 +02:00
PJB3005 02c67c851d Basic content repo outline.
Code's here, no tooling to generate content packs yet, however.
2017-08-04 14:24:01 +02:00
clusterfack 8d7293bdd2 Import engine as submodule
Trying an https link to allow submodule downloading without SSH authentication
2017-05-30 22:50:10 -05:00
clusterfack 20affd2ace Revert "Import engine as submodule (#1)" (#2)
This reverts commit 8adabfab67.
2017-05-30 22:20:55 -05:00
Matt Smith 8adabfab67 Import engine as submodule (#1) 2017-05-30 21:09:47 -05:00