cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-09-29 15:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,826 Commits 26 Branches 0 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Null a262d917ec Recommit failed changelog entries (#1600) 2024-08-12 01:30:19 +00:00
Null f19310b268 Merge pull request #1533 from NullWanderer/2024/07/05-upstream-merge 
Finally, the big merge
 2024-07-25 03:17:57 +02:00
null bdd0e6615c Migrate out some missing items 2024-07-25 03:07:05 +02:00
null d0d79a0864 ActiveConveyor ops 2024-07-25 02:54:25 +02:00
null 5af6eebf3c Fake not real 2024-07-25 02:42:45 +02:00
null 46ee8d8a55 Fix yaml fails 2024-07-25 02:35:09 +02:00
null 96acb39b71 Untroll reagents 2024-07-25 02:07:54 +02:00
null 402af3cf88 Fix more funnies 2024-07-25 01:38:38 +02:00
Null 3d5955f265 Merge pull request #1494 from DeltaV-Station/guidebook-rules 
Delta-V Guidebook Rules
 2024-07-25 01:19:26 +02:00
null 61244f8a2f Fix oopsie 2024-07-25 00:23:07 +02:00
null ed71a646e3 Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/07/05-upstream-merge 
# Conflicts:
#	Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
 2024-07-25 00:07:10 +02:00
Null 49831071bd Revert "Security resprite and loadout revision" (#1517) 2024-07-22 09:56:03 +02:00
null 437d098ed7 Update config presets 2024-07-19 04:44:50 +02:00
null 9e60fa9d36 Fix linter fail 2024-07-19 04:43:40 +02:00
Null eb8d70fd76 I love file permissions 2024-07-14 19:44:11 +00:00
Null 9e22328ce1 CDN V2 2024-07-14 19:23:31 +00:00
Null ddd1c287c0 Revert sophie name (#1460) 
Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
 2024-07-04 22:59:50 +00:00
Null 5568ddf24f Log giving items to the Oracle or Butlertrol (#1450) 
Log oracle and Roboisseur sells
 2024-07-01 21:59:16 +00:00
Null ee4dd88a53 Revert "Nyano port of digging (#400)" (#1452) 
This reverts commit 089398d2
 2024-07-01 21:57:16 +00:00
Null 46d6c80e95 Fix ShuttleManipulator protoid (#1449) 2024-07-01 21:53:40 +00:00
Null 206e27699a Fix ClothingBackpackDuffelSyndicateFilledLMG 
Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
 2024-07-01 23:46:23 +02:00
Null 7b6b3916c3 Fix shipyard UI refusing to open (#1364) 
Fix shipyard ui
 2024-06-12 16:46:40 +00:00
Null 21cd750ff4 Merge pull request #1331 from NullWanderer/2024/06/06-upstream-merge 
Upstream merge
 2024-06-11 17:12:03 +02:00
null 976aa679e2 Fix number 2 hopefully 2024-06-11 13:41:06 +02:00
null b70880595d Fix test fail? 2024-06-11 13:21:14 +02:00
Null 80b2566567 Update deltav.toml (#1333) 
Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
 2024-06-08 23:03:55 +02:00
null 5ab73ea298 Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/06/06-upstream-merge 
# Conflicts:
#	Resources/Prototypes/Maps/submarine.yml
 2024-06-08 21:03:00 +02:00
null a1c590fe53 Fix duplicate locale entries 2024-06-08 20:44:24 +02:00
null 303e71d84c Some code fixes 2024-06-08 20:37:53 +02:00
null 993959ae58 Replace deprecated whitelist functions 2024-06-08 20:12:43 +02:00
Null 46c4a13b3e Revert "Remove most syndicate maints loot" (#1314) 
Revert "Remove dumb syndicate loot (#336)"

This reverts commit 0916635901.
 2024-06-06 23:07:44 +02:00
null 792afce5cb Some tool related fixes 2024-06-06 22:16:17 +02:00
null c1bc4c9182 Matrix3x2 2024-06-06 21:50:25 +02:00
null d7d489e4de Remove deleted field from bluespace 2024-06-06 21:43:31 +02:00
null f8746e20f2 Clean RES.Pacified a bit 2024-06-06 21:36:31 +02:00
Null 9962a0f366 Revert "Revert Reverts New E-Sword Sprites #591" (#1290) 
Revert "Revert Reverts New E-Sword Sprites #591 (#1264)"

This reverts commit ed67ebd5a6.
 2024-06-02 19:24:50 +02:00
Null 391f235234 Adjust config presets (#1281) 
Config preset changes
 2024-06-02 00:59:53 +02:00
Null 6e40de164b Remove tesla spawner that was accidentally committed (#1279) 
Update crates.yml

Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
 2024-06-01 20:29:42 +02:00
Null 42d08a72c2 Merge pull request #1278 from NullWanderer/2024/06/01-upstream-merge 
2024/06/01 upstream merge
 2024-06-01 18:15:18 +02:00
null 893a3078e7 Localize pride/courier vending text 2024-06-01 17:54:14 +02:00
null 89f4e0c12b Fix linter error 2024-06-01 17:38:24 +02:00
null e0b3c63392 Fix spare ID safe 2024-06-01 17:38:13 +02:00
null ed3e930117 Remove some remaining terminator stuff 2024-06-01 17:10:04 +02:00
null 8c6e708c3c Fix linter error 2024-06-01 17:09:51 +02:00
null 0f131bae60 Add delta access to the admin cards 2024-06-01 17:09:44 +02:00
Null 77b4a41ca6 Update Rules.txt (#1276) 
Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
 2024-05-31 11:36:28 +02:00
Null fc6c24943e Merge branch 'master' into secrespritefinally 2024-05-19 01:16:20 +02:00
Null 0976829e7f Roboisseur no longer sends messages in the chat (#1222) 
Webedit ops

Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
 2024-05-18 23:15:46 +02:00
Null ba0e5e2a61 DeltaV species guidebook entries (#1174) 
* DeltaV species guidebook entries

Copied straight from the wiki :D

* Forgor

* Update Oni.xml

Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>

---------

Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
 2024-05-18 21:37:06 +02:00
Null 72853c1b09 Senior ID cards get a custom job name (#1218) 
* Allow preset id's to have different job names

* Senior roles

* Sync with Station Records

* Change markers
 2024-05-18 21:29:07 +02:00
Null e055f22bbb Senior loadouts require whitelist (#1219) 
Require whitelist for senior gear
 2024-05-18 19:34:28 +02:00
Null d839875d87 Remove mimic event (#1220) 
Bye bye mimic
 2024-05-18 18:49:20 +02:00
Null 12a3c846ea Merge pull request #1216 from NullWanderer/2024/05/18-merge-master 
Merge upstream
 2024-05-18 14:29:28 +02:00
null a37b4c3477 Fix build error 2024-05-18 14:12:42 +02:00
null 546f5f8daa Fix prescription huds 2024-05-18 13:46:58 +02:00
null 51c06a3613 Revert "Fix prescription glasses working from pockets (#286)" 
This reverts commit 168699d23a.
 2024-05-18 13:37:43 +02:00
null fc8ddf7df1 Revert "Fix to cyborgs being able to spawn with nearsighted. (#606)" 
This reverts commit 1b185d5b60.
 2024-05-18 13:37:02 +02:00
null d48b13ce64 Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/05/18-merge-master 2024-05-18 13:29:48 +02:00
null edf7661031 Revert "Temporary CI/CD fix (#1199)" 
This reverts commit 7e3ba621d3.
 2024-05-18 13:26:23 +02:00
Null 4c6bfc8557 Merge pull request #1204 from DeltaV-Station/2024/05/15-Antag-refactor 
Merge antag refactor
 2024-05-15 20:38:09 +02:00
null 20fbb117a7 Auto namespace cleanup for Delta/Nyano gamerules 2024-05-15 19:56:18 +02:00
Null f9ec70d258 Merge pull request #1122 from DeltaV-Station/2024/04/21-loadouts 
Loadouts
 2024-05-15 14:48:11 +02:00
Null f168cde164 Merge branch 'master' into 2024/04/21-loadouts 2024-05-15 13:38:01 +02:00
Null 7e3ba621d3 Temporary CI/CD fix (#1199) 
Testing my beloved
 2024-05-15 11:36:29 +00:00
null 7a0b89ed54 Remove incorrect values 2024-05-15 13:12:16 +02:00
null 7f6449b5e9 Remove EnsureJobRequirementsValid 
Its code that frequently breaks, and while I could fix it, I don't think its needed currently.
 2024-05-15 13:11:54 +02:00
Null b14097d0b6 Revert "Felinid Thievery" (#1177) 
Revert "Felinid Thievery (#1102)"

This reverts commit 9b763f3758.
 2024-05-09 14:59:48 +02:00
Null bbf52f84fb Forgotten merge changelog 
Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
 2024-05-08 01:49:08 +02:00
Null e4d30f6e52 Fix labeler 
Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
 2024-05-08 01:37:17 +02:00
null f8bb40cc5e Cargonia update 2024-05-07 23:20:57 +02:00
null 9b85bc92a4 Experimental harpy jumpsuit displacement 2024-05-07 23:20:42 +02:00
null 8db7894d51 Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/04/21-loadouts 2024-05-07 22:52:49 +02:00
Null ce38a7be75 Merge pull request #1170 from NullWanderer/2024/05/02-Merge-master 
Merge upstream
 2024-05-07 22:50:32 +02:00
null 234074c4ed Reset TagSystem to base 2024-05-07 04:56:20 +02:00
null a2ac3f6bac Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/05/02-Merge-master 
# Conflicts:
#	Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
#	Content.Server/Pinpointer/NavMapSystem.cs
#	Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
#	Content.Shared/Tag/TagSystem.cs
#	Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
 2024-05-07 04:53:36 +02:00
null e3010a5545 Fix NukeOpsTest fail 2024-05-07 03:59:24 +02:00
null d1d90d7704 Carrying build error 2024-05-07 03:50:40 +02:00
null 2da98edb69 Revert BasicEventScheduler timer change 2024-05-07 03:46:45 +02:00
null d0fb9c800d Trading post doesn't try to spawn in the lobby 
I love tests!!!
 2024-05-07 03:37:52 +02:00
null 54006e46e6 Small linter errors 2024-05-07 03:19:24 +02:00
null cd9f84c8c9 Fix for harpy emote conflicts 2024-05-07 03:07:44 +02:00
null 7e301ad1d3 Delta Emote locstrings 2024-05-07 02:32:20 +02:00
null bb986f7e5e Fix Nyano emote locs 2024-05-07 02:27:01 +02:00
null 48c2c90f4a Holy damage locid 2024-05-07 02:08:09 +02:00
null f6d12593e1 Add immaterial damage group loc 2024-05-07 01:57:04 +02:00
null e33082620c Linter error 2024-05-07 01:48:43 +02:00
NullandAzzy 8f9113b766 Increase moth color blending strength by 25% and replace color blending with the intended helper function 
* Replace weird lerping with intended function

* Increase effect strength by 25%

---------

Co-authored-by: Azzy <azzydev@icloud.com>
 2024-05-06 15:27:26 +00:00
null 46680383a5 Thing 2024-05-05 01:39:36 +02:00
null 8a4cfda6d7 Fix content UIs 2024-05-05 01:39:06 +02:00
Null ac36b41f31 Merge pull request #1163 from DeltaV-Station/2024/05/04-Terrible-lag-fix 
Resolve navmap performance issues
 2024-05-04 18:26:37 +02:00
null 0f5092af79 Remove check that requires engine update 
Signed-off-by: null <56081759+NullWanderer@users.noreply.github.com>
 2024-05-04 18:15:00 +02:00
null 466351abd3 Do the thing for the things (UI prediction stuff or something) 2024-05-03 00:18:25 +02:00
null de4dc5a057 RT is dirty 2024-05-03 00:04:44 +02:00
Null 511685e7b6 Revert "Railgun" (#1155) 
Revert "Railgun (#718)"

This reverts commit c0de272a13.
 2024-04-29 19:55:00 +00:00
Null 63b78a68ae Update engine to V219.1.3 (#1126) 2024-04-23 18:25:19 +02:00
NullWanderer 1bf611910e Normalize localisation 
Signed-off-by: NullWanderer <56081759+NullWanderer@users.noreply.github.com>
 2024-04-23 00:09:53 +02:00
NullWanderer b2b419c97c Further courier and mail carrier separation 
Signed-off-by: NullWanderer <56081759+NullWanderer@users.noreply.github.com>
 2024-04-23 00:09:48 +02:00
NullWanderer 6bbba607f8 Some loadouts are optional 
Signed-off-by: NullWanderer <56081759+NullWanderer@users.noreply.github.com>
 2024-04-22 23:53:05 +02:00
NullWanderer 1c08b7cccb Additional courier loadouts 
Signed-off-by: NullWanderer <56081759+NullWanderer@users.noreply.github.com>
 2024-04-22 23:51:51 +02:00
NullWanderer fc9c3c439d Fix swapped filenames 
Signed-off-by: NullWanderer <56081759+NullWanderer@users.noreply.github.com>
 2024-04-22 23:47:05 +02:00