cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-19 11:42:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,908 Commits 26 Branches 0 Tags
micro_talk
Commit Graph

4908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
QuoteFox 7aced82a0e Merge pull request #1595 from Kabramen/Fitting-Overalls-for-vendors-and-loadout 
Fitting Overalls for vendors and loadout
 2022-04-26 22:06:22 +01:00
Kabramen d9ff0a10bb Move the overalls from the kinkmate to the clothesmate 2022-04-26 18:05:42 -03:00
QuoteFox 8c2aada0c8 Merge pull request #1594 from sarcoph/misc-recreation 
cards rework + love dice
 2022-04-26 21:38:10 +01:00
Kabramen 59c99d8d4a Fitting Overalls for vendors and loadout 2022-04-26 17:20:48 -03:00
sarcoph 68713535ba clearer love dice descriptions 2022-04-25 23:40:03 -08:00
sarcoph 81d7752973 fuck it recompiles your tgui 
bottom text
 2022-04-25 23:24:01 -08:00
sarcoph 29e53d1cc3 fix failed merge bug 
if you merged cards but they were incompatible decks it would delete the cards. this stops it from doing that
 2022-04-25 23:19:47 -08:00
sarcoph f196c61606 Merge branch 'master' into misc-recreation 2022-04-25 23:06:45 -08:00
sarcoph 104a26dea8 fuck it 2022-04-25 23:00:05 -08:00
sarcoph 157024ee94 base cards done 2022-04-25 22:02:09 -08:00
Dahlular 10bb6b0c3b Merge pull request #1516 from ArchieBeepBoop/spook 
[s] Spooky Element
 2022-04-25 12:52:27 -06:00
Dahlular 2e413c99ac Merge pull request #1592 from SquishyRolls/Raccverals 
Overalls fix and Lewd Overalls
 2022-04-25 11:36:02 -06:00
SquishyRolls 6ef2eae8cd Overalls fix and Lewd Overalls 
Fixes the Digi-Legs Overalls that can be bought from vendors. Also adds 'Form Fitting Overalls' A pair of overalls that can be worn on the suit slot and has the same functionality as the Latex Bodysuit.
 2022-04-25 17:26:12 +01:00
Dahlular 3aa881916d Merge pull request #1591 from Arctaisia/gremllucyte 
Crystal Gremlins!
 2022-04-25 07:19:40 -06:00
Arctaisia Xiakta 72406a49d8 Crystal Gremlins! 
Uhoh, looks like these little cuties have a little symbiosis going on!
 2022-04-25 23:09:36 +10:00
sarcoph 818fcedad6 cards part 1 2022-04-24 20:28:30 -08:00
Dahlular c11ded70fa Merge pull request #1590 from Arctaisia/kalyna 
New Hydroponics plant, Kalyna (Red Viburnum/Guelder rose)
 2022-04-24 00:23:33 -06:00
Arctaisia Xiakta f76ca53065 modularises 
FINALLY finished modularising the code,,
 2022-04-24 15:40:50 +10:00
Arctaisia Xiakta 323ccd7e79 Update megaseed.dm 
MORE stuff
 2022-04-24 14:09:38 +10:00
Arctaisia Xiakta fff0006124 Kalyna 
Adds Kalyna plants, drinks, and berries.
 2022-04-24 13:28:07 +10:00
QuoteFox f01da00a64 Merge pull request #1589 from quotefox/dependabot/npm_and_yarn/tgui/ini-1.3.8 
Bump ini from 1.3.5 to 1.3.8 in /tgui
 2022-04-23 18:55:14 +01:00
QuoteFox 60a49f5839 Merge pull request #1588 from quotefox/dependabot/npm_and_yarn/tgui/ansi-regex-4.1.1 
Bump ansi-regex from 4.1.0 to 4.1.1 in /tgui
 2022-04-23 18:55:07 +01:00
dependabot[bot] 17b824788c Bump ini from 1.3.5 to 1.3.8 in /tgui 
Bumps [ini](https://github.com/npm/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/npm/ini/releases)
- [Changelog](https://github.com/npm/ini/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/ini/compare/v1.3.5...v1.3.8)

---
updated-dependencies:
- dependency-name: ini
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-23 17:54:26 +00:00
dependabot[bot] 127b7bf44f Bump ansi-regex from 4.1.0 to 4.1.1 in /tgui 
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-23 17:54:00 +00:00
QuoteFox f089c5805c Merge pull request #1570 from quotefox/dependabot/npm_and_yarn/tgui/minimist-1.2.6 
Bump minimist from 1.2.5 to 1.2.6 in /tgui
 2022-04-23 18:53:55 +01:00
QuoteFox ef08e1b6c8 Merge pull request #1565 from quotefox/dependabot/pip/tools/mapmerge2/pillow-9.0.1 
Bump pillow from 9.0.0 to 9.0.1 in /tools/mapmerge2
 2022-04-23 18:53:49 +01:00
QuoteFox c9c8dee1bd Merge pull request #1559 from quotefox/dependabot/npm_and_yarn/tgui/y18n-4.0.3 
Bump y18n from 4.0.0 to 4.0.3 in /tgui
 2022-04-23 18:53:40 +01:00
QuoteFox ca410f833f Merge pull request #1558 from quotefox/dependabot/npm_and_yarn/tgui/elliptic-6.5.4 
Bump elliptic from 6.5.2 to 6.5.4 in /tgui
 2022-04-23 18:53:34 +01:00
QuoteFox 8343310831 Merge pull request #1556 from quotefox/dependabot/npm_and_yarn/tgui/ajv-6.12.6 
Bump ajv from 6.12.0 to 6.12.6 in /tgui
 2022-04-23 18:53:27 +01:00
Dahlular d983e17a2c Merge pull request #1587 from SquishyRolls/Raccmarkingalt 
Racc Marking Alt
 2022-04-20 11:28:02 -06:00
SquishyRolls ef834032fa Racc Marking Alt 
Changes the Secondary and Tertiary marking colors on the Raccoon Body Marking. Also some slight edits to the digitigrade socks to please my gremlin brain.
 2022-04-20 18:06:39 +01:00
Dahlular fdb81fc0dd Merge pull request #1586 from ArchieBeepBoop/itsarock 
Nitpick Pellucyte Fixes or "It's a fucking rock"
 2022-04-20 03:24:47 -06:00
Archie 7b3d77ed1c Merge remote-tracking branch 'upstream/master' into spook 2022-04-20 01:50:11 -03:00
Archie 02d4ae2138 Pellucyte Fixes 2022-04-20 01:44:44 -03:00
Dahlular 946bafac2c Merge pull request #1585 from Dahlular/sizeandstuff 
Normalizing Jewelry
 2022-04-18 04:23:59 -06:00
Dahlular 235c2e487e Normalizing Jewelry 2022-04-18 04:20:08 -06:00
Dahlular 4503238371 Merge pull request #1584 from ProbablyCarl/gremlins_again 
Gremlin Icon Implementation
 2022-04-17 22:32:41 -06:00
ProbablyCarl e2e4d1e608 Gremlin Icon Implementation 
- - -
Does as it says on the tin. Simply enables the new gremlin icons to be utilised.
 2022-04-17 18:31:11 -04:00
Dahlular 99ca21677d Appendicitis CHILL OUT 2022-04-17 05:15:29 -06:00
Dahlular 7987e41cb9 Merge pull request #1583 from ToonClyde/Gremlin 
New gremlin textures
 2022-04-16 03:59:10 -06:00
ToonClyde 136c9c51ff New gremlin textures 2022-04-15 19:05:00 -07:00
Dahlular 55df08ac16 Quick update for this admin implant 2022-04-15 10:05:34 -06:00
Dahlular 74e88b1eab Merge pull request #1581 from ProbablyCarl/Gremlins 
Gremlins
 2022-04-15 00:30:07 -06:00
Dahlular 5f679cdc44 Merge pull request #1582 from TotallyNotADog/fixVomitBoxes 
resprites colored boxes
 2022-04-15 00:24:46 -06:00
TotallyNotADog 75dee4a6a2 resprites colored boxes 2022-04-15 00:56:14 -05:00
ProbablyCarl 9010048b74 This introduces Gremlins. 2022-04-12 08:06:21 -04:00
Dahlular a21b108343 Merge pull request #1579 from ProbablyCarl/reactor_qol 
[Ready] Reactor QoL | Multi-Tile Poddoors
 2022-04-11 02:44:23 -06:00
Dahlular 0fcb808fc3 Merge pull request #1580 from ProbablyCarl/master 
Oh God Oh Fuck
 2022-04-10 08:18:41 -06:00
Carl? 5fcecef7d8 Merge pull request #1 from ProbablyCarl/hotfix-1 
Oh God Oh Fuck
 2022-04-10 10:17:19 -04:00
Carl? 61ca092a24 Oh God Oh Fuck 
Emergency hotfix for a misnamed path.
Without this, the reactor is scuffed and spews radiation. Bugs ahoy.
 2022-04-10 10:17:00 -04:00