shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,675 Commits 5 Branches 0 Tags
a415453540887b5757b72bb7c3a2db874b6c6dcb
Commit Graph
3251 Commits
Author SHA1 Message Date
siliconsandGitHub 74280ed082 Merge pull request #14582 from BlueWildrose/slimeorgans 
Slimeperson organs are now unique with a unique name, therefore confusing people
 2021-04-18 19:02:53 -06:00
siliconsandGitHub b41790842b Merge pull request #14546 from Putnam3145/bluespace-pipe 
Ports bluespace pipes from yogs
 2021-04-18 18:53:14 -06:00
siliconsandGitHub 9f032df236 Merge pull request #14608 from TheObserver-sys/TheHoldoutUpdate 
The Holdout Update: How I learned to stop whining, and aim a pocket pistol.
 2021-04-18 18:50:37 -06:00
siliconsandGitHub 3b08587cf1 Merge pull request #14613 from HeroWithYay/Bottle 
New Bottle Sprites
 2021-04-18 18:50:28 -06:00
HeroWithYay a759aae2fb re-adds hypovial80 and bluespace80 2021-04-15 18:14:00 +12:00
LinandGitHub f3ea2d58dc Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff 
Pirate related fixes and communication console fixes
 2021-04-14 21:39:06 -05:00
HeroWithYay 65d6be40fb Botttle 2021-04-15 06:01:26 +12:00
skodaiandGitHub 275a946031 Update food.dmi (#14601) 2021-04-14 14:06:00 +02:00
siliconsandGitHub ef2482c6b0 renders storage objects independently per user (#14545) 
* sigh

* sigh

* override

* hah..

* kinda working

* done
 2021-04-13 15:16:21 +02:00
Blue Wildrose 8b47786556 Pirate stuff and comm console fixes 2021-04-13 00:53:55 -07:00
The0bserver e75088420d Error fixing. 2021-04-11 04:38:46 -04:00
Blue Wildrose db9c538c97 Fixed female slimesubspecies left/right sprites being flipped 
who the heck messed this up
 2021-04-09 22:35:59 -07:00
siliconsandGitHub f1de2d37aa Merge pull request #14535 from brokenOculus/adds-Telescopic-Baseball-bat 
Adds telescopic baseball bat
 2021-04-08 03:22:56 -06:00
Blue Wildrose cd81345e9f Polishing up the new slimeperson organs also WHY IS THE SLIMEBRAIN SPRITE GONE 2021-04-07 15:00:09 -07:00
Blue Wildrose 3cf25a8cc7 Slimeperson organs are now more confusing 2021-04-06 23:10:23 -07:00
EricandGitHub 08c89f421a updates telescopic bat inhand sprites 2021-04-03 17:07:25 -05:00
Putnam 6ae984971c Ported bluespace pipes from yogs 2021-03-30 23:25:36 -07:00
LetterN f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
EricandGitHub 2a5d756034 Add files via upload 
Adds inhand sprites for Telescopic bat.
 2021-03-28 22:40:50 -05:00
EricandGitHub fe71135d7a Add files via upload 
Updates item icons for Telescopic Bat
 2021-03-28 22:38:53 -05:00
siliconsandGitHub a3d0dd6cf1 Merge pull request #14434 from dzahlus/joy 
Adds radial skin menu to joy mask, pensive, angry, flushed
 2021-03-27 01:35:18 -06:00
siliconsandGitHub bf382f490c Merge pull request #14518 from necromanceranne/shield_explodies_fix 
Shields: Changes, additional flags, bug fixes, sprites
 2021-03-27 01:31:55 -06:00
necromanceranne 84223c65f5 Adds the shield flags to the ratvaran shield, adds the remaining sprites for the kinetic/energy/holo shields 2021-03-26 07:07:48 +11:00
siliconsandGitHub 602140af99 Merge pull request #14497 from Hatterhat/lever-guns 
.38 lever-action rifles but not actually implemented
 2021-03-24 19:22:36 -06:00
necromanceranne 79de55c58c First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately. 2021-03-25 09:07:52 +11:00
LetterN e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
Hatterhat 30a9ad5059 yeehaw :) 2021-03-23 18:55:00 -05:00
Fabian eb0973969d Merge branch 'master' into joy 2021-03-23 20:28:09 +01:00
siliconsandGitHub 5910950a49 Merge pull request #14473 from ItzGabby/bark-box 
Bark Box Remastered Edition
 2021-03-22 21:15:14 -06:00
siliconsandGitHub bfb122d706 Merge pull request #14475 from qweq12yt/black-market-fixes 
Black Market: The return
 2021-03-22 21:14:57 -06:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
LinandGitHub 9941b5288b Merge pull request #14462 from Hatterhat/bsbeaker 
adds a missing icon state for bluespace beaker filling
 2021-03-19 18:52:17 -05:00
kappa-samaandqweq12yt 524bb79f0e tgui machine broke 2021-03-19 15:32:53 -03:00
ItzGabby 5c53b598b5 hopefully this fixes the conflict 2021-03-19 02:55:17 -04:00
ItzGabby 68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby b0abc6d726 Revert "fixes conflict" 
This reverts commit 23d5b3377b.
 2021-03-19 02:43:30 -04:00
ItzGabby 23d5b3377b fixes conflict 2021-03-19 02:42:17 -04:00
ItzGabby 4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
siliconsandGitHub e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real 
[HERETICS] Void & a handful of heretics-related PRS
 2021-03-18 06:38:40 -06:00
Hatterhat 361acfd904 beaker fix 2021-03-17 16:15:38 -05:00
DeltaFireandGitHub 79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2 
Clockwork cult rite additions and other edits
 2021-03-16 07:39:41 +01:00
LinandGitHub 73b29bcca0 Merge pull request #14438 from Citadel-Station-13/shrinemaidendonator 
Adds Shrine Maiden outfit for donator
 2021-03-15 19:27:24 -05:00
siliconsandGitHub 5472186bc2 Merge pull request #14398 from LetterN/post-hardsync1.5 
post-hardsync1.5
 2021-03-14 23:30:26 -06:00
Jay e4ab673e4a Adds Shrine Maiden outfit for donator 2021-03-14 18:40:01 -05:00
kiwedespars baab4217e0 readded succumb button and also removes halo. 2021-03-13 19:41:02 -08:00
Fabian bb4459ef5e flushed pensive angry 2021-03-13 21:24:29 +01:00
siliconsandGitHub d985e9bae3 Merge pull request #14411 from kiwedespars/cute-plushie 
adds a cute new plushie
 2021-03-13 12:47:34 -07:00
siliconsandGitHub 186682d38d Merge pull request #14419 from necromanceranne/augment_fixes 
Fixes cosmetic augments missing their feet
 2021-03-13 12:17:58 -07:00
Fabian 036ba24545 flooshed? 2021-03-13 20:17:01 +01:00
kiwedespars 815ebd97da Merge branch 'master' into cute-plushie 2021-03-13 01:41:28 -08:00