Commit Graph

3331 Commits

Author SHA1 Message Date
DragonTrance
b0acab2ad8 typo 2021-04-22 00:05:03 -07:00
DragonTrance
2de635f4dd can now click stuff while in slime consoles 2021-04-21 23:48:15 -07:00
QuoteFox
a13810ff27 parallax edit. 2021-04-21 15:26:51 +01:00
QuoteFox
77c7ab6be7 box fix
boxfix
2021-04-21 15:24:21 +01:00
QuoteFox
24cc6e02e1 smidge darker. 2021-04-20 22:19:25 +01:00
QuoteFox
56e2476e81 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-04-20 22:11:59 +01:00
QuoteFox
e7774e377d starmap, feet. 2021-04-20 22:11:58 +01:00
QuoteFox
ff7cbf483d Merge pull request #1079 from DragonTrance/various-fixes
Various fixes
2021-04-20 21:41:45 +01:00
QuoteFox
9c61a94d9e jani sprites, drink sprites, and no super large monkey energry 2021-04-20 21:38:06 +01:00
QuoteFox
34b18b82b7 Runetime v2 fixes and isnt in the main hallway on start anymore. 2021-04-20 20:37:03 +01:00
QuoteFox
2f29e73a20 Cumming into containers now add overlay, Work on your aim. Cumming into containers now tells you how much you jizzed. 2021-04-20 19:17:19 +01:00
QuoteFox
15eabeb708 Hight heels fix for digigrade legs. 2021-04-20 18:55:40 +01:00
QuoteFox
970c0a628a Runtime V2 2021-04-20 18:09:12 +01:00
DragonTrance
7b37e4c523 actually this is all i have to do 2021-04-20 05:55:10 -07:00
DragonTrance
42f4fe1721 i probably should resolve conflicts with desktop 2021-04-20 01:18:01 -07:00
DragonTrance
20e2c2fcea Merge branch 'master' into various-fixes 2021-04-20 00:56:44 -07:00
DragonTrance
b4039d7cbb various fixes v2
1 - Loadout items no longer duplicate backpack items, and all items get stored into backpacks properly
2 - Fixed a runtime with captain's job on roundstart. They will now be announced when they join at the start of the shift.
3 - Fixed filter runtime when transferring ckeys
4 - Economy SS no longer fires, so it will no longer clutter runtime logs
5 - Fixed laughing peas not being able to be taken out of seed extractors by lazily renaming them
2021-04-20 00:52:33 -07:00
QuoteFox
38c83b2039 Merge pull request #1075 from ArchieBeepBoop/synthflesh2
Hopefully fixes synthflesh and rezadone.
2021-04-19 21:41:11 +01:00
QuoteFox
1b9267e02d Merge pull request #1074 from ArchieBeepBoop/aurora
Randomizes aurora caelus songs
2021-04-19 21:41:00 +01:00
Archie
0ac9c39d4e Hopefully fixes synthflesh and rezadone. 2021-04-19 17:39:26 -03:00
QuoteFox
1cb1ae10e2 bug fixes, speed potion and layering 2021-04-19 20:03:41 +01:00
Archie
b1a06d39c6 Randomizes aurora songs once again 2021-04-19 15:44:11 -03:00
Dahlular
d085b4b001 Merge pull request #1073 from ArchieBeepBoop/nebula
Adds the nebula parallax
2021-04-18 23:37:28 -06:00
Archie
1e6553a62b Adds the nebula parallax 2021-04-19 02:33:28 -03:00
Dahlular
a3b4cb6baa Merge pull request #1072 from ArchieBeepBoop/parallaxupdate
Random Parallax Layers
2021-04-18 23:12:17 -06:00
Archie
d89aec9ce1 Random Parallax 2021-04-19 02:08:21 -03:00
Dahlular
6b11a44d87 Merge pull request #1071 from ArchieBeepBoop/fixpack1
Oh no, it's another Archie Fix Pack
2021-04-18 21:48:00 -06:00
Archie
2f7f72ea0e Archie Fix Pack 1 2021-04-18 21:07:35 -03:00
QuoteFox
180f21fd8c smoothing on vagina. 2021-04-18 19:14:55 +01:00
QuoteFox
a1f1c33b65 slime style portal fleshlight
now slimes have their own style wow.
2021-04-18 19:09:40 +01:00
QuoteFox
a862d9e574 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-04-18 18:46:54 +01:00
QuoteFox
85c7dba12e More portal fleshlight options, and bug fix for nails. 2021-04-18 18:46:48 +01:00
Dahlular
f2bd4ed664 Merge pull request #1070 from ArchieBeepBoop/drone
drone gaming
2021-04-17 22:49:44 -06:00
Archie
fce68d94bf drone gaming 2021-04-18 01:45:22 -03:00
Dahlular
b90bf2e6eb Merge pull request #1069 from Dahlular/stopbeingcringe
Disables His Grace, Restricts Cult Traitor Items
2021-04-17 21:27:40 -06:00
Dahlular
02dc3abcf6 Merge branch 'master' into stopbeingcringe 2021-04-17 21:26:32 -06:00
Dahlular
c55452bdb8 Disables His Grace, restricts cult items 2021-04-17 21:20:40 -06:00
Dahlular
978748b8d8 Merge pull request #1066 from lyricalpaws/master
We're off to see the wizard
2021-04-17 21:09:27 -06:00
Dahlular
d55e7516f4 Merge pull request #1068 from ArchieBeepBoop/uplinktest
Makes it so the arcane tome and clockwork slab cannot be discounted
2021-04-17 21:06:50 -06:00
Archie
b2fde2c0c0 Makes it so the arcane tome and clockwork slab cannot be discounted 2021-04-17 23:17:05 -03:00
QuoteFox
fb21e779b1 Nail paint cosmetics 2021-04-17 22:41:02 +01:00
QuoteFox
276a81f026 fluffy half-crop jacket. 2021-04-17 21:21:21 +01:00
QuoteFox
b776ec2b9b Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-04-17 14:28:45 +01:00
QuoteFox
37f90be2e9 y 2021-04-17 14:28:27 +01:00
Dahlular
57a82fa7a5 Merge pull request #1067 from ArchieBeepBoop/libraryissus
Book of PRing your PRs (Bookify Smite)
2021-04-17 01:30:05 -06:00
Archie
447c784c0a Totally Original Reference 2021-04-17 04:25:51 -03:00
QuoteFox
7804208a21 compile error fix 2021-04-17 02:20:53 +01:00
QuoteFox
a8181f8678 portal fleshlight bug fixes 2021-04-17 02:09:46 +01:00
QuoteFox
822a2a182b New kitsune tail 2021-04-16 22:45:19 +01:00
QuoteFox
629a0e35f2 Demon tail 2021-04-16 22:09:32 +01:00