shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,552 Commits 5 Branches 0 Tags
398d892fb05fd2db87dad63ffa5039ed545665f4
Commit Graph

47552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DeltaFire
398d892fb0 oops 2023-11-13 15:43:16 +01:00
dependabot[bot]
f68955e954 Bump path-parse from 1.0.6 to 1.0.7 in /tgui (#16032) 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:55:03 +01:00
dependabot[bot]
03e3f60bb3 Bump tar from 6.1.8 to 6.2.0 in /tgui (#16031) 
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.8 to 6.2.0.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.8...v6.2.0)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:46:18 +01:00
dependabot[bot]
933623db9b Bump word-wrap from 1.2.3 to 1.2.5 in /tgui (#16030) 
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.5)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:38:16 +01:00
dependabot[bot]
92af54a999 Bump semver from 6.3.0 to 6.3.1 in /tgui (#16029) 
Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:38:11 +01:00
dependabot[bot]
d283ededa1 Bump @babel/traverse from 7.15.0 to 7.23.2 in /tgui (#16018) 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.15.0 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:27:20 +01:00
dependabot[bot]
19657c62ae Bump tmpl from 1.0.4 to 1.0.5 in /tgui (#15958) 
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:26:57 +01:00
dependabot[bot]
e16626ed4d Bump axios from 0.21.1 to 1.6.0 in /tgui (#16026) 
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v1.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:26:39 +01:00
dependabot[bot]
32331f61ee Bump postcss from 8.3.6 to 8.4.31 in /tgui (#16009) 
Bumps [postcss](https://github.com/postcss/postcss) from 8.3.6 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.3.6...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:25:53 +01:00
dependabot[bot]
550e93204f Bump pillow from 9.3.0 to 10.0.1 in /tools (#16006) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.3.0 to 10.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.3.0...10.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>
 2023-11-13 13:25:38 +01:00
dependabot[bot]
62a66b7ee8 Bump http-cache-semantics from 4.1.0 to 4.1.1 in /tgui (#15964) 
* Bump http-cache-semantics from 4.1.0 to 4.1.1 in /tgui

Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

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

* resetting CI

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2023-11-13 13:25:24 +01:00
Putnam3145
9c4792ea80 Some dynamic midround tweaking (#15841) 
* midround wizard, blob

* make dynamic respect midround pref, too

* Makes attempt_replacement not just make traitors

* Tried to make it poll if you wanna be a wizard

* something is going to happen in 1 minutes

* i left it half finished!

* This one seems a bit over the top

---------

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2023-11-13 13:00:04 +01:00
DJKouta
5dc2241d6a Syndicate Skinned Box Station (#15580) 
* Syndicate Skinned Box Station

* Create syndicatestation.json

Okay tHIS FIXED IT I THINK HOLY CRAP THIS WAS AN EXPERIENCE.  HERES THE JSON!

* actually makes this work

* random runtime

we lvoe lesser-used items with runtiming actions

---------

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2023-11-13 12:48:38 +01:00
shellspeed1
912e0b3d51 Update lavaland_surface_seed_vault.dmm (#15835) 2023-11-13 10:18:43 +01:00
BlueWildrose
54089a159c SpookyStation fixes and edits (#16019) 
* spooky 2023

* Spooky colormates, better telecomms?

* yes

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* yes

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* minor pre-merge change

I don't feel like requesting changes for this small of a nitpick so I'll just do it myself & merge.

---------

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2023-11-13 10:02:31 +01:00
BlueWildrose
c9b0dedf77 Merge pull request #16023 from KrissKr0ss/rename-icon-files 
Renames update icons files
 2023-11-04 18:48:22 -06:00
BlueWildrose
5265a92b0e Merge pull request #16025 from SandPoot/runtime-station 
Fix runtime station, pods, and touches maps
 2023-11-04 02:35:58 -06:00
BlueWildrose
2a732767e1 Merge pull request #16024 from SandPoot/fix-texts_by_atom-being-nulled 
FIxes a case of texts_by_atom on flavor text being nulled
 2023-11-04 02:33:28 -06:00
SandPoot
44421ed042 push 2023-11-03 23:46:34 -03:00
SandPoot
1dc38c46d6 poosh 2023-11-02 23:17:49 -03:00
KrissKr0ss
b7c7c24f63 rename icons files 2023-11-01 13:51:19 -05:00
BlueWildrose
720374a7ef Merge pull request #16022 from SandPoot/fix-loadout-runtime-not-spawning-items 
Fix loadout runtime (which prevents remaining items from spawning)
 2023-10-31 14:47:20 -06:00
SandPoot
55e0e5de06 real quick 2023-10-28 17:54:31 -03:00
SandPoot
0b6d743e22 go 2023-10-28 17:51:02 -03:00
Lin
f27f1a21b0 Merge pull request #16015 from SandPoot/undo-accidental-rollback 
Screentips show the option correctly again
 2023-10-16 15:26:49 -04:00
Lin
b13249854c Merge pull request #16017 from SandPoot/silicons-flavor-text-loading 
Silicon flavor text loading (for real now)
 2023-10-16 15:26:32 -04:00
SandPoot
297ee64977 push 2023-10-12 15:45:35 -03:00
SandPoot
45d5d92775 oops 2023-10-12 14:28:57 -03:00
BlueWildrose
c4c57d3e26 Merge pull request #16014 from Citadel-Station-13/revert-16007-throwing-updat 
Revert "[DNM] Updates firemanning, throwing stuff"
 2023-10-11 13:53:30 -06:00
BlueWildrose
def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
BlueWildrose
aff43910af Merge pull request #16007 from SandPoot/throwing-updat 
[DNM] Updates firemanning, throwing stuff
 2023-10-11 13:51:54 -06:00
BlueWildrose
9f29f08cd0 Merge pull request #16013 from SandPoot/change-preferences 
Preferences menu layout change
 2023-10-11 13:51:37 -06:00
Lin
0c823be763 Merge pull request #16012 from SandPoot/admin-respawn-runtime 
Fixes runtime when unrestricted respawning someone
 2023-10-09 15:37:06 -04:00
Lin
de4168bc0e Merge pull request #16011 from SandPoot/not-again-- 
Fixes piggyback riding
 2023-10-09 15:36:52 -04:00
SandPoot
d4ea14c4ef push 2023-10-09 16:15:49 -03:00
SandPoot
b624de1c10 you go 2023-10-08 13:01:15 -03:00
SandPoot
c5ba21994d If i had a nickel for every time incapacitated() had some issue, i would have... 2023-10-08 12:49:40 -03:00
Lin
610a02e554 Merge pull request #16008 from SandPoot/update-config 
Ports tgstation#59874 & #60951
 2023-10-07 22:12:48 -04:00
Lin
559288df78 Merge pull request #16010 from SandPoot/me-when-loadout-code 
Fixes donator backpack items
 2023-10-07 22:09:35 -04:00
SandPoot
4429bce1e1 yeah 2023-10-07 14:36:26 -03:00
SandPoot
d16a39505f oopsies 2023-10-05 21:39:55 -03:00
SandPoot
6cd2cfcd01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-config 2023-10-05 21:25:29 -03:00
SandPoot
ddf9827afb lowercasing possible 2023-10-05 21:24:13 -03:00
SandPoot
a105852042 the stuff 
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
 2023-10-05 21:15:11 -03:00
SandPoot
c3735c05ac Merge branch 'master' into throwing-updat 2023-10-04 15:15:15 -03:00
SandPoot
5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
Lin
bae4216c20 Merge pull request #16003 from SandPoot/held-plushies 
Adds held sprites to plushes
 2023-10-03 17:51:26 -04:00
Lin
6dc628e053 Merge pull request #16004 from SandPoot/reskin-tip 
Makes the hints for reskinning things not require empty hand
 2023-10-03 17:49:32 -04:00
Lin
c11c1fe8c6 Merge pull request #16005 from SandPoot/why-though 
Makes age_verification config work properly
 2023-10-03 17:47:56 -04:00
SandPoot
962c3e7b76 fix 2023-10-03 14:31:45 -03:00