Commit Graph
833 Commits
Author SHA1 Message Date
JaySparrow dfba9674a2 Merge remote-tracking branch 'upstream/master' 2020-06-12 03:53:28 -05:00
Jay-SparrowandGitHub fe39969114 Enable leash.dm 2020-06-12 03:15:58 -05: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
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
QuoteFox 23e95e7b26 Update tgstation.dme 2020-06-04 22:42:45 +01:00
SlimeRetardandGitHub 89605c9194 Adds headpat slut trait check 2020-06-04 22:40:40 +01:00
QuoteFox 4a999d79a4 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-06-04 22:37:05 +01:00
QuoteFox ceb76565da Update tgstation.dme 2020-06-04 22:37:03 +01:00
SlimeRetardandGitHub 8068eba0d9 Add lewd headpat mood event 2020-06-04 22:31:56 +01:00
SlimeRetardandGitHub 227c2c626c Add headpat slut quirk 2020-06-04 22:25:27 +01:00
SlimeRetardandGitHub 5e1c90b54b Add headpat slut trait 2020-06-04 22:21:49 +01:00
DahlularandGitHub 90570c9792 Merge pull request #264 from SlimeRetard/master
Add breast and penis augmentation surgeries
2020-06-04 15:11:14 -06:00
SlimeRetardandGitHub e783a7e35a Tick the new surgery files 2020-06-04 02:20:32 +01:00
SlimeRetardandGitHub cc1b0ef04c Add breast and penis augmentation surgeries 2020-06-04 02:19:02 +01:00
DahlularandGitHub cc97d8d275 Merge pull request #262 from Dahlular/omegalul
Omegastation Updates and Fixes
2020-05-31 14:44:58 -06:00
Dahlular 3d13a8807d i stuck my tallywhacker in a bag of doritos 2020-05-31 14:28:46 -06:00
Dahlular e901733929 fuck you 2020-05-31 12:52:35 -06:00
DahlularandGitHub e57720ca92 Merge pull request #261 from Jay-Sparrow/master
Bondage rope
2020-05-31 11:16:45 -06:00
DahlularandGitHub 343effc9d7 Merge pull request #257 from JamieSS13/patch-1
Carp migration reduction
2020-05-31 11:14:00 -06:00
DahlularandGitHub c4033fc3d0 Merge pull request #260 from SlimeRetard/master
Altered new book text and mechannics to make sense
2020-05-31 11:12:52 -06:00
Jay-SparrowandGitHub a81e036286 Add rope sprites
Two sets of worn sprites for the rope restraint. One set is a placeholder for a full body rope restraint, that looks horrible. The other is simple wrist tying behind the back which looks alright. The code is set to use the behind the back variation for now.
2020-05-30 16:32:20 -05:00
Jay-SparrowandGitHub d4d0148293 Rope object sprite
It's a placeholder sprite really. I'm not much of an artist.
2020-05-30 16:29:19 -05:00
Jay-SparrowandGitHub cb83245b41 Rope code
All the code for the rope object. Basically reskinned fake handcuffs with a few lewd effects added.
2020-05-30 16:28:18 -05:00
SlimeRetardandGitHub 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
SlimeRetardandGitHub 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
DahlularandGitHub 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
DahlularandGitHub a0070341aa Merge pull request #259 from Dahlular/omegalul
Updates Omegastation for Usage
2020-05-25 12:20:34 -06:00
Dahlular b6c1f8c3de STUPID FUCKING DOOR
and a light i guess lol
2020-05-25 12:15:14 -06:00