Commit Graph

514 Commits

Author SHA1 Message Date
Kabra_men a3f97bb181 Size bits fix 2020-06-15 06:24:01 -03: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
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
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 29b0b841d9 Compiling Error
duplicate definition
2020-06-12 02:31:58 -06: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
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-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 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
Dahlular 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
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
Dahlular cee70f0ae1 We're not changing this one quite yet 2020-06-09 20:56:58 -06: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
SlimeRetard 131c3974d4 Add mesmetron 2020-06-08 01:03:07 +01: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 8068eba0d9 Add lewd headpat mood event 2020-06-04 22:31:56 +01:00
SlimeRetard 227c2c626c Add headpat slut quirk 2020-06-04 22:25:27 +01:00
SlimeRetard 5e1c90b54b Add headpat slut trait 2020-06-04 22:21:49 +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
QuoteFox 780c4eaf5f You forgot a quotation
owned lol
2020-05-25 21:31:43 +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 488795db33 Merge pull request #245 from improvedname/nerf-
Nerfs lavaland side bombs
2020-04-20 16:30:45 -06:00
Dahlular 4aac5734ae Merge pull request #256 from Dahlular/sizecode
Moves some files around and adds interactions to micro mob holders
2020-04-19 21:36:10 -06:00
Dahlular ffc31b6fae Moves some files around and adds interactions to mob holders
woo
2020-04-19 21:34:21 -06:00
QuoteFox b35c02d54f Penis update
*penis music*
2020-04-19 06:46:27 +01: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