shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,281 Commits 5 Branches 0 Tags
8feb473e65c3f5cfc636b694c26a89aa61f66914
Commit Graph
43281 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons 8feb473e65 fixes 2021-06-12 04:49:23 -07:00
silicons 55e8d67521 refactor a bit 2021-06-12 04:41:58 -07:00
silicons 85b1125c83 fix 2021-06-12 04:36:02 -07:00
CitadelStationBot c33348fe18 Automatic changelog generation for PR #14768 [ci skip] 2021-06-10 19:52:15 -05:00
BlackMajorandGitHub 86881dc1af Merge pull request #14768 from Citadel-Station-13/silicons-patch-33 
makes xenos immune to stamina damage, with something that might be potentially horrifically abusable but isn't really fixable in a clean way yet
 2021-06-11 12:52:12 +12:00
Changelogs a683754160 Automatic changelog compile [ci skip] 2021-06-11 00:23:59 +00:00
Changelogs 9376ec0d04 Automatic changelog compile [ci skip] 2021-06-10 00:25:00 +00:00
CitadelStationBot d3f1a163b1 Automatic changelog generation for PR #14683 [ci skip] 2021-06-09 14:14:39 -05:00
siliconsandGitHub 5e4f3ed694 Merge pull request #14683 from keronshb/shovedisarmgun 
Off Balance Disarms only if shoved into a wall or person.
 2021-06-09 12:14:37 -07:00
keronshb 33affb4f10 THREE SECONDS 2021-06-09 15:14:07 -04:00
CitadelStationBot e78715d952 Automatic changelog generation for PR #14776 [ci skip] 2021-06-09 13:29:26 -05:00
siliconsandGitHub 09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon 
New Challenger: The Cat Surgeon has appeared! (Ready!)
 2021-06-09 11:29:24 -07:00
CitadelStationBot 13c965e5f3 Automatic changelog generation for PR #14766 [ci skip] 2021-06-09 13:22:28 -05:00
siliconsandGitHub a77aa8bd41 Merge pull request #14766 from Linzolle/cultfix 
Fix cult area shenanigans, cult can do stuff in maint again.
 2021-06-09 11:22:26 -07:00
CitadelStationBot fa24353b16 Automatic changelog generation for PR #14762 [ci skip] 2021-06-09 13:21:57 -05:00
siliconsandGitHub 224efa0e26 Merge pull request #14762 from DrPainis/patch-2 
adds cat meteors
 2021-06-09 11:21:55 -07:00
CitadelStationBot 535435633e Automatic changelog generation for PR #14760 [ci skip] 2021-06-09 13:21:24 -05:00
siliconsandGitHub eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00
CitadelStationBot 323e2f4355 Automatic changelog generation for PR #14759 [ci skip] 2021-06-09 13:21:14 -05:00
siliconsandGitHub 996a99b7f4 Merge pull request #14759 from Arturlang/uplink_misc_item_rebalances 
Changes the cost of the holoparasite injector and the ricochet eyepatch
 2021-06-09 11:21:12 -07:00
CitadelStationBot c094d771c1 Automatic changelog generation for PR #14749 [ci skip] 2021-06-09 13:20:52 -05:00
siliconsandGitHub a56ac3ce07 Merge pull request #14749 from DrPainis/patch-14 
adds goliath calamari (currently untested because Forget™)
 2021-06-09 11:20:49 -07:00
CitadelStationBot 34b3fd1011 Automatic changelog generation for PR #14771 [ci skip] 2021-06-09 13:19:42 -05:00
siliconsandGitHub 30e7939e0e Merge pull request #14771 from keronshb/disposalcargo 
Lets the Cargo Shuttle use Disposal Pipes again
 2021-06-09 11:19:40 -07:00
CitadelStationBot 8d9cfc7b4a Automatic changelog generation for PR #14796 [ci skip] 2021-06-09 13:18:35 -05:00
siliconsandGitHub 564a3aaa4b Merge pull request #14796 from MrJWhit/the-pr-that-gets-people-pissed 
Moves medical holodeck to restricted
 2021-06-09 11:18:32 -07:00
CitadelStationBot 82a61121cd Automatic changelog generation for PR #14803 [ci skip] 2021-06-09 13:18:12 -05:00
siliconsandGitHub b28d4f26f3 Merge pull request #14803 from bunny232/airmixies 
21/79 not 20/80
 2021-06-09 11:18:10 -07:00
CitadelStationBot 21e816abba Automatic changelog generation for PR #14806 [ci skip] 2021-06-09 13:17:54 -05:00
siliconsandGitHub dcd80edf5f Merge pull request #14806 from zeroisthebiggay/patch-11 
cuts the amount of essence revenant objective needs in half so it is actually feasibly possible
 2021-06-09 11:17:52 -07:00
siliconsandGitHub 0ee2892bee Merge pull request #14807 from Putnam3145/make-sleeper-pref-good 
makes medihound sleeper toggle do something
 2021-06-09 11:17:39 -07:00
CitadelStationBot 5197b0aff3 Automatic changelog generation for PR #14808 [ci skip] 2021-06-09 13:17:27 -05:00
siliconsandGitHub 7af470efef Merge pull request #14808 from SandPoot/fixes-soulstones 
Fixes soulstones runtiming
 2021-06-09 11:17:25 -07:00
CitadelStationBot 4b675a9300 Automatic changelog generation for PR #14810 [ci skip] 2021-06-09 13:17:20 -05:00
siliconsandGitHub c7df74f452 Merge pull request #14810 from zeroisthebiggay/patch-12 
Clowncar exploit fix
 2021-06-09 11:17:17 -07:00
siliconsandGitHub ec63a4c62b Merge pull request #14779 from Arturlang/Orbit_menu_antags 
Makes orbit menu show antags if DNR
 2021-06-09 11:17:14 -07:00
siliconsandGitHub 3d86ce9bda Merge pull request #14787 from WanderingFox95/WanderingFox95-ORV-Revamp 
ORV Uniform Revamp
 2021-06-09 11:17:06 -07:00
CitadelStationBot a339d43eac Automatic changelog generation for PR #14802 [ci skip] 2021-06-09 13:15:58 -05:00
siliconsandGitHub a7781f77fd Merge pull request #14802 from bunny232/atmosfoam 
Atmos resin buff? fix?
 2021-06-09 11:15:56 -07:00
CitadelStationBot 31b544dc67 Automatic changelog generation for PR #14805 [ci skip] 2021-06-09 13:15:41 -05:00
siliconsandGitHub 2402c56bfc Merge pull request #14805 from bunny232/hydroslimejelly 
Hydroponics slimejelly recipe from tg
 2021-06-09 11:15:36 -07:00
siliconsandGitHub 460026f3bc Merge pull request #14774 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/ws-7.4.6 
Bump ws from 7.4.3 to 7.4.6 in /tgui
 2021-06-09 11:15:22 -07:00
siliconsandGitHub 5ffceb376d Merge pull request #14812 from Citadel-Station-13/dependabot/pip/tools/pillow-8.2.0 
Bump pillow from 8.1.1 to 8.2.0 in /tools
 2021-06-09 11:15:11 -07:00
CitadelStationBot 87e6b3992f Automatic changelog generation for PR #14809 [ci skip] 2021-06-09 13:15:03 -05:00
siliconsandGitHub c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes 
Centralizes borg speech and uses some of the icons for the typing indicator
 2021-06-09 11:15:01 -07:00
siliconsandGitHub 259aed7903 Merge pull request #14783 from DeltaFire15/spec-species-color 
Colors species names depending on traits
 2021-06-09 11:14:48 -07:00
siliconsandGitHub fe8323f503 Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps 
Adds more deconstruction steps to stronger windows.
 2021-06-09 11:13:13 -07:00
CitadelStationBot 03e71c36a5 Automatic changelog generation for PR #14712 [ci skip] 2021-06-09 13:12:26 -05:00
siliconsandGitHub 7963dce24e Merge pull request #14712 from keronshb/hereticadjustments 
Minor Heretic rework and fixes (Includes shifting realities and more)
 2021-06-09 11:12:23 -07:00
CitadelStationBot 0a2f05b5dd Automatic changelog generation for PR #14160 [ci skip] 2021-06-09 13:10:20 -05:00