cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-03-06 03:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
866 Commits 12 Branches 0 Tags
4df58f2b7ea7181f3d285023482da3e027680c1e
Commit Graph

355 Commits

Author SHA1 Message Date
Jay-Sparrow
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
Dahlular
97081e8247 Merge pull request #271 from Jay-Sparrow/master 
The Leash
 2020-06-13 23:32:42 -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
QuoteFox
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
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
QuoteFox
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
Dahlular
a8407fc71e reeee 2020-06-12 00:43:38 -06:00
Dahlular
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
QuoteFox
2278ae133e hotfix to runescape chat 
hotfix to runescape chat
 2020-06-12 02:21:48 +01:00
Jay-Sparrow
ef9f8f52fe Merge pull request #1 from quotefox/master 
Update fork to master
 2020-06-11 20:02:46 -05:00
Jay-Sparrow
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
QuoteFox
060ac61c48 Runescape Style Chat. 
Orginal: https://github.com/tgstation/tgstation/pull/50608
 2020-06-11 12:12:01 +01:00
Dahlular
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
Dahlular
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
SlimeRetard
89605c9194 Adds headpat slut trait check 2020-06-04 22:40:40 +01:00
SlimeRetard
cc1b0ef04c Add breast and penis augmentation surgeries 2020-06-04 02:19:02 +01:00
Dahlular
343effc9d7 Merge pull request #257 from JamieSS13/patch-1 
Carp migration reduction
 2020-05-31 11:14:00 -06:00
SlimeRetard
be6e30d135 Altered pen descriptions for Readpads 
Modified text to all the regular pens that detail how they're compatible with digital devices and regular paper, so their interactions with the Readpad makes sense
 2020-05-26 17:20:27 +01:00
SlimeRetard
be6c22690d Fixed up the Readpad so it makes sense 
Interaction text changed, changed "carving" tool to multitool that erases the data in the Readpad, made it non-flamable since its a small-computer device, added propper trademark signs
 2020-05-26 17:18:23 +01:00
Dahlular
5c7e7e1151 Merge pull request #250 from Oposshim/call-it-whatever-the-fuck-i-want 
Book sprite revamp
 2020-05-25 13:00:56 -06:00
JamieSS13
fb9a21ca7c Carp migration reduction 
Increases minimum players and decreases weight so there is a better chance of carps not being the most idiotic round-ending event ever.
 2020-04-23 17:04:30 -04:00
Oposshim
e4ba630d6c So I finally tweaked the code for the datapads so >IF< someone actually inspects it, it wont just say book and break muh immersion 2020-04-21 21:22:27 -04:00
Dahlular
ffc31b6fae Moves some files around and adds interactions to mob holders 
woo
 2020-04-19 21:34:21 -06:00
Dahlular
a456cf723e Makes grabbing interactions more interesting on step 
Also potentially really fuckin unbalanced too
 2020-04-18 14:05:10 -06:00
Dahlular
ace42d130d Really quickly fixes animals to be held 
whoops haha
 2020-04-17 15:35:21 -06:00
Dahlular
35fdabe699 Finishes up basic mechanics and un-buggifies them 
cum is stored in the red solo cup is the best receptacle
For barbecues tailgates fairs and festivals
And you sir do not have a pair of testicles
If you prefer drinking from glass
A red solos cup is cheap and disposable
And in fourteen years they are decomposable
And unlike my home they are not fore-closable
Freddie Mac can kiss my ass woo
Red solo cup I fill you up
Let's have a party let's have a party
I love you red solo cup I lift you up
Proceed to party proceed to party
Now I really love how your easy to stack
But I really hate how your easy to crack
'Cause when beer runs down the front of my back
Well that my friends is quite yucky
But I have to admit that the ladies get smitten
Admiring how sharply my first name is written
On you with a sharpie when I get to hittin'
On…
 2020-04-17 14:55:50 -06:00
Dahlular
9a8a8af918 Fixes and updates code a bit ye 
cum is stored in the mouth and rhrhrnglnrhrlbrhttrrhrr
 2020-04-17 10:10:18 -06:00
Dahlular
d3882fb0f4 Merge branch 'master' into sizecode 2020-04-17 08:07:37 -06:00
QuoteFox
bc05254a49 Merge pull request #248 from VladinXXV/magboot-hell 
Magboot fixes and changes
 2020-04-06 10:03:23 +01:00
QuoteFox
a96b5eae50 Update 
Fixes to boxstation doors, lavaland doors, RCD now allows users to rotate doors, Voice_of_god.dm var changes to stop confliction with next update. New wooden floor texture, New walls.
 2020-04-05 22:20:00 +01:00
Vladin Ampora
1d423448fe New vg_shoes.dm 
COOL AND RELEVANT
 2020-04-04 17:20:57 -04:00
Vladin Ampora
00652c486b FUCK THIS IT IS OLD NOW 
Old and irrelevant code. I fix.
 2020-04-04 17:19:32 -04:00
QuoteFox
5ef32f42a1 a 
a fuck off mate.
 2020-03-28 09:34:48 +00:00
QuoteFox
7562eace10 Fixed hands sprite for markings. 
Fixed because I fucked up. But hands should be fixed for mam markings now.
 2020-03-28 09:34:02 +00:00
QuoteFox
fbf75e7be1 Fixed hands sprite for markings. 
Fixed marking hands sprites.
 2020-03-28 09:32:35 +00:00
Improvedname
905d1c622e Map 2020-03-23 17:27:53 +01:00
Dahlular
e72ad9ebd4 Merge pull request #241 from improvedname/n-thats-jazzzz 
Ports more stuff
 2020-03-22 22:05:05 -06:00
Dahlular
94fed547d3 Merge pull request #229 from improvedname/Miner-nerf 
Miner balance
 2020-03-22 20:32:00 -06:00
Dahlular
12811fc930 Merge pull request #238 from jbox144/makes-the-cum 
Ports previous changes of breasts to the penis
 2020-03-22 20:30:46 -06:00
Dahlular
2459570517 Merge pull request #232 from improvedname/War 
Does #231 but properly
 2020-03-22 20:27:55 -06:00
Improvedname
78786b28da ff 2020-03-22 19:17:51 +01:00