cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-22 20:46:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
858 Commits 12 Branches 0 Tags
4fd7067842af1844ec7dde7ed469abdf95afe3ca
Commit Graph
858 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay-SparrowandGitHub 4fd7067842 Merge branch 'master' into Bluespace-patch 2020-06-14 23:50:04 -05:00
JaySparrow 4c60d0c7f2 Bluespace sewing kit 
For big bits
 2020-06-14 22:24:38 -05:00
JaySparrow 926d352540 Merge branch 'master' into Bluespace-patch 2020-06-14 13:15:18 -05:00
DahlularandGitHub 97081e8247 Merge pull request #271 from Jay-Sparrow/master 
The Leash
 2020-06-13 23:32:42 -06:00
DahlularandGitHub 5538795834 Merge pull request #278 from Kabramen/cumburger 
Cumburger
 2020-06-13 23:32:11 -06:00
Kabra_men 3f4e0185b9 Update snacks_burgers.dm 2020-06-13 09:32:51 -03:00
Kabra_men d2cef209ce Merge branch 'master' into cumburger 2020-06-13 01:28:53 -03:00
Kabra_men b5361ec52c Cumburger 2020-06-13 01:15:24 -03:00
QuoteFoxandGitHub 4c1e05259d Merge pull request #277 from Oposshim/call-it-whatever-the-fuck-i-want 
Call it whatever the fuck i want
 2020-06-13 04:10:03 +01:00
QuoteFoxandGitHub 5d6658b2da Update README.md 
requires [513.1525] or higher
 2020-06-13 04:07:56 +01:00
Oposshim f9bf7e3883 Merge branch 'call-it-whatever-the-fuck-i-want' of https://github.com/Oposshim/Hyper-Station-13 into call-it-whatever-the-fuck-i-want 2020-06-12 20:00:16 -04:00
Oposshim fd45d84d84 another kinaris push + fix 
i cant mentally do this anymore, i checked the code myself it should work and fit
 2020-06-12 19:59:33 -04:00
JaySparrow c7d724875d Update tgstation.dme 2020-06-12 16:26:17 -05:00
JaySparrow 0f81c6e050 Update tgstation.dme 2020-06-12 16:24:17 -05:00
JaySparrow f70035c1a1 Merge branch 'master' of https://github.com/Jay-Sparrow/Hyper-Station-13 2020-06-12 16:20:22 -05:00
JaySparrow 2c63192cc1 Update tgstation.dme 2020-06-12 16:20:08 -05:00
Jay-SparrowandGitHub 22f0e7366d Better sprite from Azala! Actually looks good! 2020-06-12 16:19:09 -05:00
Oposshim cd7fa47670 barsign fix 
fucking, while splicing code there was a forward slash that rendered the code fucked and it took me 10 minutes just to find one single symbol that fucked the game compiling
 2020-06-12 13:42:07 -04:00
QuoteFox 1f7897bd2c test 
test commit
 2020-06-12 18:16:46 +01:00
QuoteFoxandGitHub b2b863b34c Merge pull request #273 from Oposshim/call-it-whatever-the-fuck-i-want 
Call it whatever the fuck i want
 2020-06-12 18:07:04 +01:00
JaySparrow dfba9674a2 Merge remote-tracking branch 'upstream/master' 2020-06-12 03:53:28 -05:00
DahlularandGitHub 29b0b841d9 Compiling Error 
duplicate definition
 2020-06-12 02:31:58 -06:00
Jay-SparrowandGitHub fe39969114 Enable leash.dm 2020-06-12 03:15:58 -05:00
DahlularandGitHub a8407fc71e reeee 2020-06-12 00:43:38 -06:00
DahlularandGitHub 0cdf20a9b6 aaaa no dont do that 
i dont wanna have people yell at me for being a snowflake
 2020-06-12 00:42:36 -06:00
Oposshim 1c6b863fc5 soap 
i forgot to fix the soap sprite and its kinaris descript
 2020-06-12 01:07:22 -04:00
QuoteFox 2278ae133e hotfix to runescape chat 
hotfix to runescape chat
 2020-06-12 02:21:48 +01:00
Jay-SparrowandGitHub ef9f8f52fe Merge pull request #1 from quotefox/master 
Update fork to master
 2020-06-11 20:02:46 -05:00
Jay-SparrowandGitHub d23d193a68 Re-enable orgasm command for MK Ultra 
The command for orgasm was always programmed into MK, and functions like it does for Voice of God, but was commented out. All this does is uncomment the code so it will work again.
 2020-06-11 15:27:57 -05:00
Oposshim 0880ceb0c7 Kinaris.Co Revamp2 
more code changes to kin co instead of nanotrasen
 2020-06-11 14:17:33 -04:00
QuoteFoxandGitHub d24f078cce Merge pull request #272 from quotefox/QuoteSandbox 
Runescape Style Chat.
 2020-06-11 12:20:51 +01:00
QuoteFox 060ac61c48 Runescape Style Chat. 
Orginal: https://github.com/tgstation/tgstation/pull/50608
 2020-06-11 12:12:01 +01:00
Jay-SparrowandGitHub 1105cb4227 The leash 
A leash! Hook it to your pet's collar and drag them around!
 2020-06-10 22:32:31 -05:00
DahlularandGitHub 6f57fc2f63 Merge pull request #269 from SlimeRetard/master 
Port the mesmetron from aurorastation and put it in hacked kinkmate
 2020-06-10 20:00:09 -06:00
SlimeRetardandGitHub 1324eb895f Added the mesmetron file to the .dme 
God im retarded
 2020-06-11 00:07:54 +01:00
DahlularandGitHub 1cee045dc1 Merge pull request #268 from TotallyNotADog/omegaFix 
Fixes power+pipenet issues on Omega
 2020-06-10 15:34:07 -06:00
Jay-SparrowandGitHub 43a2c50f54 Leash sprite 2020-06-10 11:24:45 -05:00
DahlularandGitHub 90603d76e6 Merge pull request #270 from Oposshim/call-it-whatever-the-fuck-i-want 
Kinaris.Co Revamp
 2020-06-09 21:25:38 -06:00
Oposshim ec63e00e6c Merge branch 'call-it-whatever-the-fuck-i-want' of https://github.com/Oposshim/Hyper-Station-13 into call-it-whatever-the-fuck-i-want 2020-06-09 23:21:25 -04:00
Oposshim 9fadd24031 dahl deleted a file 
the replacement file
 2020-06-09 23:19:36 -04:00
DahlularandGitHub cee70f0ae1 We're not changing this one quite yet 2020-06-09 20:56:58 -06:00
DahlularandGitHub 96c19c5382 Merge branch 'master' into call-it-whatever-the-fuck-i-want 2020-06-09 20:54:12 -06:00
Oposshim b99ac77618 Kinaris.Co Revamp 
friendship ended with nanotrasen, now friends with Kinaris.co

https://cdn.discordapp.com/attachments/366046230830252033/720066721859502080/friendship-ended-with-mudasir-salman-is-m-best-friend-friendship-53353410.png
 2020-06-09 22:33:40 -04:00
SlimeRetardandGitHub eb28480874 Make mesmetron available in hacked kinkmate 2020-06-08 01:07:25 +01:00
SlimeRetardandGitHub d235986c25 Add mesmetron sprites 2020-06-08 01:04:22 +01:00
SlimeRetardandGitHub 131c3974d4 Add mesmetron 2020-06-08 01:03:07 +01:00
Unknown c56222d166 Fixes power+pipenet issues on Omega 2020-06-05 13:59:41 -05:00
DahlularandGitHub c9c4ebbd28 Merge pull request #267 from Dahlular/ntsucc 
Resprites CC Items and Adds New Cosmetics
 2020-06-05 01:03:41 -06:00
Dahlular 0172b30847 Green is cringe 
fuck you
 2020-06-05 00:41:18 -06:00
DahlularandGitHub 38ac8f9d5e Merge pull request #266 from SlimeRetard/master 
Add headpat slut quirk
 2020-06-04 20:09:05 -06:00