silicons
|
44fdbaadcb
|
Merge pull request #14684 from zeroisthebiggay/pirates
Pirate Update: Milk Is Not A Medical Substitute
|
2021-05-07 18:40:41 -06:00 |
|
silicons
|
e8b7abcfc6
|
Merge pull request #14664 from WanderingFox95/WanderingFox95-TheUnrollingPin
The Unrolling Pin! (Ready)
|
2021-05-07 18:40:33 -06:00 |
|
zerothebigboy
|
5138d86655
|
skylarlineman'safurry
|
2021-05-05 03:35:25 -04:00 |
|
silicons
|
45bc4fcb46
|
Merge pull request #14673 from TheObserver-sys/SovietCrate
Soviet Crates, now available!
|
2021-05-03 21:08:37 -06:00 |
|
SandPoot
|
8f3a44f44a
|
fancy gateway
|
2021-05-02 18:57:04 -03:00 |
|
The0bserver
|
f1109c4f67
|
what a crate day (initial commit)
|
2021-05-01 02:15:07 -04:00 |
|
WanderingFox95
|
3ea98d3096
|
Merge branch 'master' into WanderingFox95-TheUnrollingPin
|
2021-04-29 10:54:00 +02:00 |
|
WanderingFox95
|
dd6de51b26
|
Adds the Icon for the Unrolling Pin
|
2021-04-26 18:45:54 +02:00 |
|
necromanceranne
|
0f04bbb23b
|
Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power
|
2021-04-22 13:06:31 +10:00 |
|
silicons
|
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 |
|
silicons
|
b41790842b
|
Merge pull request #14546 from Putnam3145/bluespace-pipe
Ports bluespace pipes from yogs
|
2021-04-18 18:53:14 -06:00 |
|
silicons
|
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 |
|
silicons
|
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 |
|
Lin
|
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 |
|
skodai
|
275a946031
|
Update food.dmi (#14601)
|
2021-04-14 14:06:00 +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
|
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 |
|
Putnam
|
6ae984971c
|
Ported bluespace pipes from yogs
|
2021-03-30 23:25:36 -07:00 |
|
Eric
|
fe71135d7a
|
Add files via upload
Updates item icons for Telescopic Bat
|
2021-03-28 22:38:53 -05:00 |
|
silicons
|
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 |
|
silicons
|
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 |
|
silicons
|
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 |
|
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 |
|
silicons
|
5910950a49
|
Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
|
2021-03-22 21:15:14 -06:00 |
|
silicons
|
bfb122d706
|
Merge pull request #14475 from qweq12yt/black-market-fixes
Black Market: The return
|
2021-03-22 21:14:57 -06:00 |
|
Lin
|
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-sama
|
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 |
|
silicons
|
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 |
|
Jay
|
e4ab673e4a
|
Adds Shrine Maiden outfit for donator
|
2021-03-14 18:40:01 -05:00 |
|
Fabian
|
bb4459ef5e
|
flushed pensive angry
|
2021-03-13 21:24:29 +01:00 |
|
Fabian
|
036ba24545
|
flooshed?
|
2021-03-13 20:17:01 +01:00 |
|
kiwedespars
|
69d927e756
|
Merge branch 'master' into void-but-for-real
|
2021-03-12 23:10:19 -08:00 |
|
kiwedespars
|
3b19a8d7ef
|
removes herobrine, adds mini version
|
2021-03-11 00:54:21 -08:00 |
|
kiwedespars
|
951515cdf0
|
added backpck
|
2021-03-11 00:43:21 -08:00 |
|
kiwedespars
|
43c6795bc4
|
Merge branch 'master' into cute-plushie
|
2021-03-11 00:24:29 -08:00 |
|
kiwedespars
|
923ef94c5d
|
adds the aww maaan
|
2021-03-11 00:21:14 -08:00 |
|
kiwedespars
|
95c809114d
|
i made it better
|
2021-03-11 00:17:38 -08:00 |
|