shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,659 Commits 5 Branches 0 Tags
a2833ea85f89f44436188f5357af93c1c73ddcf8
Commit Graph
40659 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
keronshb a2833ea85f Movitation WIP 
WIP still working on this
 2021-01-26 13:27:06 -05:00
CitadelStationBot 7ad42c9d53 Automatic changelog generation for PR #13963 [ci skip] 2021-01-17 21:43:27 -06:00
siliconsandGitHub 4099e57f4e Merge pull request #13963 from necromanceranne/robocoat 
Mostly ports tgstation #54644; New roboticist labcoat sprites
 2021-01-17 20:43:24 -07:00
CitadelStationBot 6dd48ba515 Automatic changelog generation for PR #14037 [ci skip] 2021-01-17 21:42:23 -06:00
siliconsandGitHub 2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel 
Nanogel for robotic limbs
 2021-01-17 20:42:19 -07:00
CitadelStationBot 233bdebd53 Automatic changelog generation for PR #14030 [ci skip] 2021-01-17 21:41:32 -06:00
siliconsandGitHub 8d023b26b4 Merge pull request #14030 from Putnam3145/usual-judgment 
Replaces majority judgment with usual judgement
 2021-01-17 20:41:29 -07:00
CitadelStationBot 885ac35b32 Automatic changelog generation for PR #14029 [ci skip] 2021-01-17 21:41:23 -06:00
siliconsandGitHub af524f4a07 Merge pull request #14029 from HeroWithYay/Sci_Guns_Fix 
Ports TG code for wormhole projector and gravity gun.
 2021-01-17 20:41:20 -07:00
CitadelStationBot 988b2f6519 Automatic changelog generation for PR #14055 [ci skip] 2021-01-17 21:41:09 -06:00
siliconsandGitHub 765a4b94b3 Merge pull request #14055 from BlueWildrose/BeFreeMyWeenie 
Purges the cock and titty straining when both genitals are growing
 2021-01-17 20:41:06 -07:00
CitadelStationBot 0cc0f6def3 Automatic changelog generation for PR #14043 [ci skip] 2021-01-17 21:40:50 -06:00
siliconsandGitHub e336d26a33 Merge pull request #14043 from timothyteakettle/pie-lick 
licking people washes pie off their face
 2021-01-17 20:40:47 -07:00
CitadelStationBot cbfafa6730 Automatic changelog generation for PR #14065 [ci skip] 2021-01-17 21:40:35 -06:00
CitadelStationBot a59256279e Automatic changelog generation for PR #14070 [ci skip] 2021-01-17 21:40:34 -06:00
siliconsandGitHub f6fd5f3076 Merge pull request #14065 from MrJWhit/pubbystation-fixes 
Random pubbystation fixes
 2021-01-17 20:40:29 -07:00
siliconsandGitHub c0edfa729b Merge pull request #14070 from YakumoChen/distressingly-fuzzy 
Makes Buzz Fuzz go on a diet
 2021-01-17 20:40:22 -07:00
CitadelStationBot 18ba0d0150 Automatic changelog generation for PR #14061 [ci skip] 2021-01-17 21:40:12 -06:00
siliconsandGitHub 829e946755 Merge pull request #14061 from Hatterhat/gauze-parity 
something something gauze things
 2021-01-17 20:40:09 -07:00
LinandGitHub 07b10f268b Merge pull request #14072 from Citadel-Station-13/silicons-patch-20 
small optimization to watchers being rather aptly named and laggier than a goddamn chunkloader
 2021-01-17 19:04:22 -06:00
siliconsandGitHub 5f117a0331 Update basilisk.dm 2021-01-16 03:15:49 -07:00
YakumoChenandGitHub 693887487b I saw what had been wrought, and trembled 2021-01-16 08:29:14 +00:00
YakumoChenandGitHub fba17abaf4 god damn it Trilby 2021-01-16 08:23:08 +00:00
YakumoChenandGitHub 6a983ff8a7 help 2021-01-16 03:20:41 -05:00
necromanceranne 5b5bc85b8f Fixes conflicts AGAIN 2021-01-16 04:58:47 +11:00
necromanceranne 6ac010e442 Merge branch 'master' into robocoat 2021-01-16 04:56:03 +11:00
CitadelStationBot 668da87dca Automatic changelog generation for PR #14040 [ci skip] 2021-01-15 11:52:12 -06:00
DeltaFireandGitHub 7bdfa34321 Merge pull request #14040 from LetterN/fix-tgui 
fixes pda logs
 2021-01-15 18:52:08 +01:00
CitadelStationBot 8333d6309c Automatic changelog generation for PR #14044 [ci skip] 2021-01-15 11:50:16 -06:00
DeltaFireandGitHub 3e917653c7 Merge pull request #14044 from corin9090/beadies 
Belt slot prayer beads
 2021-01-15 18:50:14 +01:00
DeltaFireandGitHub d331dd4b1e Merge pull request #14046 from Citadel-Station-13/silicons-patch-10 
buffs and fixes BOOMERANG STUNBATONS
 2021-01-15 18:30:32 +01:00
DeltaFireandGitHub de40e96180 Merge pull request #14047 from Citadel-Station-13/silicons-patch-11 
boomerangs now properly turn ON your throw mode rather than turning it off when it already is
 2021-01-15 18:30:16 +01:00
CitadelStationBot 26a38f1868 Automatic changelog generation for PR #14048 [ci skip] 2021-01-15 11:24:21 -06:00
DeltaFireandGitHub a0e6b45111 Merge pull request #14048 from MrJWhit/hey-this-tip-of-the-round-is-wrong 
Hey this Tip Of The Round is wrong.
 2021-01-15 18:24:17 +01:00
CitadelStationBot 3f170845e4 Automatic changelog generation for PR #14054 [ci skip] 2021-01-15 11:22:08 -06:00
DeltaFireandGitHub aa1cae9f33 Merge pull request #14054 from TheObserver-sys/AReturnToForm 
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
 2021-01-15 18:22:05 +01:00
DeltaFireandGitHub f1d254f4e5 Merge pull request #14057 from Citadel-Station-13/silicons-patch-15 
removes stealthmin orbit block
 2021-01-15 18:15:56 +01:00
CitadelStationBot 9cba09dae8 Automatic changelog generation for PR #14060 [ci skip] 2021-01-15 11:14:46 -06:00
DeltaFireandGitHub 771a4f3c41 Merge pull request #14060 from Hatterhat/shrink-removal 
removes shrink ray again because "wait, whose idea was to readd this?" (turns out it was shoehorned back in by lettern during the tgui port)
 2021-01-15 18:14:42 +01:00
DeltaFireandGitHub bae7d37a89 Merge pull request #14064 from Citadel-Station-13/silicons-patch-16 
s] nothing to see here move on
 2021-01-15 18:13:08 +01:00
MrJWhit 68f8258f82 Teehee oops 2021-01-15 09:52:39 -05:00
MrJWhit 02abd90e1f Update PubbyStation.dmm 2021-01-15 09:45:32 -05:00
CitadelStationBot 90490033d3 Automatic changelog generation for PR #14042 [ci skip] 2021-01-15 05:00:11 -06:00
siliconsandGitHub 68e9be9647 Merge pull request #14042 from kiwedespars/dildo-1 
adds klonk sound effect for literal horsecock dildo
 2021-01-15 04:00:08 -07:00
siliconsandGitHub 89fd802b8f Update respawns.txt 2021-01-15 02:55:28 -07:00
CitadelStationBot 39996111fa Automatic changelog generation for PR #14062 [ci skip] 2021-01-15 03:55:06 -06:00
siliconsandGitHub beea362967 Merge pull request #14062 from kappa-sama/kaiofix 
i don't wanna talk about it
 2021-01-15 02:55:02 -07:00
kappa-sama 1134e1ce20 i don't wanna talk about it 2021-01-15 00:36:45 -05:00
Hatterhat a468f400e3 see branch name 2021-01-14 20:55:06 -06:00
Hatterhat 798b25846d gauze parity 2021-01-14 20:53:55 -06:00