shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,367 Commits 5 Branches 0 Tags
6c0aedeb4c676360495cb595a515ba7141a28aed
Commit Graph
47367 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
SandPootandGitHub 6c0aedeb4c Merge pull request #15970 from Putnam3145/fix-shuttle-event-2 
Fix shuttle catastrophe happening during transit
 2023-02-12 22:20:31 -03:00
Putnam3145 008eedfedc Fix shuttle catastrophe happening during transit 2023-02-12 17:12:52 -08:00
Timothy TeakettleandGitHub 5f6e204866 Merge pull request #15940 from squib-bot/fermichemwork 
Re-Adding Bounty Consoles
 2023-02-11 00:06:37 +00:00
Timothy TeakettleandGitHub 390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip 
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
 2023-02-09 21:39:05 +00:00
SandPoot 9e2851b76b donator. 2023-02-06 20:01:47 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
Timothy TeakettleandGitHub 7e77bc8023 Merge pull request #15963 from zeroisthebiggay/sickkicks 
sick kicks: tg/skyrat boot sprite theft
 2023-02-03 09:54:04 +00:00
Timothy TeakettleandGitHub f40584685b Merge pull request #15952 from zeroisthebiggay/sabre 
very ready sabre resprite and minor sprite tweaks
 2023-02-03 09:53:15 +00:00
Timothy TeakettleandGitHub 560fbd3ffb Merge pull request #15956 from zeroisthebiggay/posters 
poster resprite bottom text
 2023-02-03 09:52:48 +00:00
zerothebigboy d93dcf5b76 sickkicks 2023-02-01 08:25:30 -05:00
Timothy TeakettleandGitHub c357986b62 Merge pull request #15957 from zeroisthebiggay/wendigo 
the tg wendigo resprite
 2023-02-01 00:53:55 +00:00
Timothy TeakettleandGitHub 6723c0166e Merge pull request #15960 from zeroisthebiggay/glasses 
the tg gloves resprite
 2023-02-01 00:53:42 +00:00
Timothy TeakettleandGitHub 2f6d2e838b Merge pull request #15959 from zeroisthebiggay/fire 
new mob fire sprites
 2023-02-01 00:53:29 +00:00
LinandGitHub a1cdb4705a Merge pull request #15955 from SandPoot/fix-surgery-ui 
Fixed the operating computer displaying alternative steps.
 2023-01-29 22:52:29 -07:00
zerothebigboy 65a0bce02d yeppers 2023-01-29 23:07:37 -05:00
zerothebigboy c17c7fd53b realest 2023-01-29 22:56:35 -05:00
zerothebigboy 8776b8c0cc epic 2023-01-29 22:35:59 -05:00
zerothebigboy a7dd149203 shrimple 2023-01-29 22:19:56 -05:00
zerothebigboy c10b026492 yeah 2023-01-29 22:01:59 -05:00
zerothebigboy c99b22fe32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre 
# Conflicts:
#	icons/obj/items_and_weapons.dmi
 2023-01-29 21:59:01 -05:00
siliconsandGitHub 469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui 
Event menu rewrite
 2023-01-29 13:46:39 -08:00
siliconsandGitHub fec5653da6 Merge pull request #15949 from SandPoot/fix-solar-runtimes 
Turns out the glass type giving you better stats didn't work
 2023-01-29 13:46:21 -08:00
siliconsandGitHub eda34c0dc2 Merge pull request #15946 from LetterN/mentor-sql-fix 
update mentor admin log sql query
 2023-01-29 13:46:12 -08:00
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
zerothebigboy 73d0395cb5 realest 2023-01-29 08:17:01 -05:00
zerothebigboy e76221f68b yeppers 2023-01-29 03:57:32 -05:00
zerothebigboy b8bc94ba13 man 2023-01-29 00:49:55 -05:00
SandPoot 5ea481089b push 2023-01-28 21:36:23 -03:00
SandPoot 32a36a1bfa put back 2023-01-27 23:03:47 -03:00
zerothebigboy 4f034eadc1 yep 2023-01-26 05:54:51 -05:00
zerothebigboy 2cfa2c34a6 yep 2023-01-26 04:11:41 -05:00
SandPoot 54641ce201 send 2023-01-23 20:44:28 -03:00
siliconsandGitHub 2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates 
Updates bitfields, admin side
 2023-01-23 13:02:28 -08:00
SandPoot 9edcd1b353 fix it 2023-01-23 16:56:37 -03:00
SandPoot 854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
LetterN d240eb5377 update mentor admin log sql query 2023-01-22 11:40:21 +08: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
President of Shit PRS 71d588f33d Update bounty_console.dm 2023-01-14 04:00:48 +00:00