Commit Graph

378 Commits

Author SHA1 Message Date
QuoteFox
212456d64e Revert "Grab and Drag Animations"
This reverts commit ad898efb9e.
2020-07-04 08:41:11 +01:00
QuoteFox
0c33108a9a Revert "For the layer issue when dragging."
This reverts commit 96ca08bcfa.
2020-07-04 08:41:08 +01:00
Dahlular
a94810efbf Merge pull request #294 from MalricB/suicide
Ports diamond/gold/silver rings from Citadel
2020-07-03 17:13:43 -06:00
CygnusB
137ed7f372 Rings
hell yeah rings
2020-07-03 19:59:19 -03:00
ToonClyde
dc132396e3 Add hyena mane hair for player
Hair for hairy boys
2020-07-03 15:47:21 -07:00
QuoteFox
37fe138787 Removing Femur Breaker
L-RP nonsense, pruning.
2020-07-02 22:53:42 +01:00
QuoteFox
49f8093b5b Reward for Patreons!
Introduces alittle heart into chat, for the supporters!
2020-07-02 20:54:22 +01:00
QuoteFox
96ca08bcfa For the layer issue when dragging.
Layer issues when dragging, fixed
2020-07-02 10:30:32 +01:00
QuoteFox
ad898efb9e Grab and Drag Animations
Grab and Drag Animations, allowing players to see whos dragging who, via a pixel shift.
2020-07-02 09:58:24 +01:00
Dahlular
397acccb77 Merge pull request #290 from Oposshim/call-it-whatever-the-fuck-i-want
Poss Bundle pt2
2020-06-28 02:10:35 -06:00
Oposshim
eb78325c67 Poss Bundle pt2
I've been busy so this time getting back into it, I've added an Entire Kin.Co UI option/ tossed in a PREY pai operator shell/ banner in hand fix/ and scrubbed out more traces of Nanotrasen.
2020-06-25 20:39:47 -04:00
CygnusB
d173446a9f Merge remote-tracking branch 'upstream/master' 2020-06-25 01:22:55 -03:00
CygnusB
fff888bf20 lmao wataur 2020-06-25 00:59:13 -03:00
JaySparrow
2dc9c68a87 Cum code part 1
Fixes production and capacity, and adds a new trait
2020-06-22 15:55:24 -05:00
Dahlular
61ed663979 Hotfixes CC item names and descriptions 2020-06-19 03:38:36 -06:00
Dahlular
64cc766b1a Merge pull request #284 from Kabramen/glass_milk_&_cum
New sprites for glass of milk and semen
2020-06-17 05:11:07 -06:00
Dahlular
de013dd7ff Merge pull request #283 from Jay-Sparrow/Bluespace-patch
Bluespace patch patch
2020-06-17 05:09:42 -06:00
Dahlular
2516c60ee4 Merge pull request #286 from quotefox/sizecodefix
Character preference now use the beta size code.
2020-06-17 05:02:36 -06:00
QuoteFox
37b8ae86d5 using new resize method
using new resize method for players, incorpating winfres, size code update.
2020-06-17 10:56:06 +01:00
Kabra_men
0bc9c56892 New sprites for glass of milk and semen 2020-06-16 20:08:17 -03:00
JaySparrow
5c82e8d959 Merge branch 'Bluespace-patch' of https://github.com/Jay-Sparrow/Hyper-Station-13 into Bluespace-patch 2020-06-16 16:40:26 -05:00
JaySparrow
d115c1e4ac Bluespace Patch Patch
Fixes the ability to use the thread on an item that already been made roomy, and makes the spool way smaller so you can put it into a box.

Also, gives the spool more uses so that it lasts the shift, and makes it so towels have the "roomy" flag innately so you can always use them to cover your bits in a pinch.
2020-06-16 16:39:59 -05:00
Kabra_men
3321d11be0 i did a opsie 2020-06-16 13:19:58 -03:00
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