shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,334 Commits 5 Branches 0 Tags
5e30dad781b1df9c639f1c98e2904700ebb24bc8
Commit Graph
47334 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
siliconsandGitHub 5e30dad781 Merge pull request #15942 from LeDrascol/protolathe-ejection-improvements 
Protolathe material ejection improvements
 2023-01-29 13:46:01 -08:00
siliconsandGitHub bb7f6d1766 Merge pull request #15944 from LeDrascol/fix-sprite-drink-filling 
Fix drinking glass sprite issues
 2023-01-29 13:45:48 -08:00
siliconsandGitHub e7a9edbc6f Merge pull request #15953 from SandPoot/fix-pen-tablet 
Fixes the tablet pen buttons
 2023-01-29 13:42:29 -08:00
siliconsandGitHub 172ba1c4e3 Merge pull request #15951 from zeroisthebiggay/bat 
tg det baton resprite `limited editon bat inside`
 2023-01-29 13:38:54 -08:00
siliconsandGitHub 411bc2d81b Merge pull request #15925 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/follow-redirects-1.15.2 
Bump follow-redirects from 1.13.2 to 1.15.2 in /tgui
 2023-01-29 13:37:34 -08:00
SandPoot 32a36a1bfa put back 2023-01-27 23:03:47 -03:00
zerothebigboy 2cfa2c34a6 yep 2023-01-26 04:11:41 -05:00
siliconsandGitHub 2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates 
Updates bitfields, admin side
 2023-01-23 13:02:28 -08:00
SandPoot 854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
Darius 6a4ffcbc29 Fix drinking glass sprite issues 
- Fixes overlays for the drinking glass and shot glass
- Improves overlays for glassbottle and glassbottlesmall
- Removes duplicate fernetpuro and godlyblend icons
 2023-01-19 11:54:49 -05:00
LinandGitHub 6dd017fc21 Merge pull request #15933 from LeDrascol/polychromatic-cowboy-hat 
Adds the Polychromatic Cowboy Hat
 2023-01-18 18:11:21 -07:00
LinandGitHub bd6a170299 Merge pull request #15943 from SandPoot/silicon-stuff 
Update some silicon stuff
 2023-01-18 17:52:06 -07:00
Timothy TeakettleandGitHub 36ae492e50 Merge pull request #15915 from LeDrascol/update-drink-sprites 
[PORT] /tg/station Drink Sprites
 2023-01-16 23:09:43 +00:00
SandPoot 0ebcf0b72f stuff 2023-01-16 18:16:32 -03:00
Darius 4fc30ce8ae Protolathe material ejection improvements 
Updates to the protolathe:
- Added eject buttons for 10x, 20x, and 50x
- Renamed "Eject" to "1x"
- Renamed "All" to "Max Stack"
 2023-01-16 00:18:35 -05:00
LinandGitHub d65679049e Merge pull request #15939 from dapnee/let-that-sink-in 
Let that sink in
 2023-01-15 15:34:35 -07:00
LinandGitHub c73df1efb9 Merge pull request #15937 from LeDrascol/ptech-all-carts 
Add all missing job cartridges to PTech
 2023-01-15 15:34:28 -07:00
LinandGitHub a00bb99936 Merge pull request #15934 from LeDrascol/update-lumi-eyes 
Minor improvements to High Luminosity Eyes
 2023-01-15 15:34:21 -07:00
DariusandGitHub 791f89a179 Prevent nutriment pump with no process food trait (#15941) 
Prevents the nutriment pump implant from functioning on mobs with TRAIT_NO_PROCESS_FOOD., as this behavior appears to be unintended.
 2023-01-14 04:51:42 +01:00
dapnee 5251c14f65 Letting that sink in 
idk why this was never fixed
 2023-01-13 16:59:27 -07:00
Timothy TeakettleandGitHub 35d01aa0f4 Merge pull request #15918 from LeDrascol/port-heirloom-update 
[PORT] Non-global heirloom definitions
 2023-01-12 23:39:41 +00:00
Timothy TeakettleandGitHub 6f1e2120f1 Merge pull request #15935 from LeDrascol/quirk-remove-colorist 
Convert Colorist from quirk to loadout item
 2023-01-12 23:32:03 +00:00
Timothy TeakettleandGitHub 4e92976e1f Merge pull request #15936 from Hatterhat/glasses-pass2 
prescription lens kit fix
 2023-01-12 23:31:09 +00:00
Darius b25248d7ae Add all job cartridges to PTech 
Adds all remaining unavailable job cartridges to the Head of Personnel's PTech vending machine. Carts are sorted by standard job, virus, then command.
 2023-01-12 00:13:42 -05:00
Hatterhat e9ff5e00e0 works on my machine 2023-01-11 20:49:26 -06:00
Hatterhat e2b476ffa8 guess i forgot this 2023-01-11 18:33:34 -06:00
Darius aa1b82f0b1 Convert Colorist from quirk to loadout item 
Removes the Colorist quirk, and adds Hair Dye Spray to the loadout under backpack items.
 2023-01-11 14:23:14 -05:00
Darius 045eb4a8c9 Add quirk removal code for High Luminosity Eyes 
Restores the character's default eyes when removing the High Luminosity Eyes quirk. Ensures that the character has eyes, and that those eyes are luminescent.
 2023-01-11 13:41:21 -05:00
Darius d6ddb68c6f Minor updates to High Luminosity Eyes flavor text 
This commit does the following:
- Fixes minor typos
- Increases the amount of information presented
- Adjusts flavor text to be more specific
 2023-01-11 13:39:00 -05:00
Darius a8b7cd9c4a Adds the Polychromatic Cowboy Hat 
Adds a new polychromatic variant of the white cowboy hat.
 2023-01-10 20:40:01 -05:00
Timothy TeakettleandGitHub c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning 
Update to reskinning
 2023-01-11 01:00:35 +00:00
SandPoot 3b8d102fac puts pda in the system to remove shitcode 2023-01-10 20:02:12 -03:00
SandPoot cf51a4dce9 dusting off 2023-01-10 18:32:49 -03:00
SandPoot 6bbd44afe7 element time 2023-01-10 18:08:17 -03:00
siliconsandGitHub 48e713ff33 Merge pull request #15929 from JerryWester/revert-15894-modsuits 
Revert "MODsuits"
 2023-01-09 03:31:09 -08:00
SandPoot f066a260f2 previous could break 2023-01-09 08:05:48 -03:00
SandPoot c94aa43432 quick fix and little extra usage! 2023-01-08 22:02:30 -03:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
LinandGitHub efb2d19cb9 Merge pull request #15921 from LeDrascol/port-furrypride-graffiti 
[PORT] Furry Pride graffiti
 2023-01-07 16:38:34 -07:00
siliconsandGitHub e292452aae Merge pull request #15908 from Hatterhat/glasses 
loadout - glasses and price adjustments
 2023-01-07 14:10:35 -08:00
siliconsandGitHub 35497b250f Merge pull request #15914 from Hatterhat/conveyor-sorter 
[good to go] conveyor sorters, conveyor switch tool interacts, also makes mechs not explode on sale
 2023-01-07 14:09:55 -08:00
siliconsandGitHub 23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
siliconsandGitHub a4de5f6e3c Merge pull request #15924 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/json5-1.0.2 
Bump json5 from 1.0.1 to 1.0.2 in /tgui
 2023-01-07 13:53:18 -08:00
dependabot[bot]andGitHub 129a93c330 Bump follow-redirects from 1.13.2 to 1.15.2 in /tgui 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.2 to 1.15.2.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.2...v1.15.2)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-07 21:50:31 +00:00
siliconsandGitHub a12efc1790 Merge pull request #15905 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/nanoid-3.3.4 
Bump nanoid from 3.1.25 to 3.3.4 in /tgui
 2023-01-07 13:48:27 -08:00
siliconsandGitHub f6bed321cb Merge pull request #15904 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimist-1.2.7 
Bump minimist from 1.2.5 to 1.2.7 in /tgui
 2023-01-07 13:48:22 -08:00
siliconsandGitHub 87d6d97160 Merge pull request #15903 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimatch-3.1.2 
Bump minimatch from 3.0.4 to 3.1.2 in /tgui
 2023-01-07 13:48:16 -08:00
siliconsandGitHub 973bb93755 Merge pull request #15902 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/terser-5.16.1 
Bump terser from 5.7.1 to 5.16.1 in /tgui
 2023-01-07 13:47:53 -08:00
dependabot[bot]andGitHub 78bb808a7a Bump json5 from 1.0.1 to 1.0.2 in /tgui 
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-07 20:27:40 +00:00