 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 |
|
|
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 |
|
|
kiwedespars
|
9c35266481
|
adds a cute new plushie
|
2021-03-11 00:05:47 -08:00 |
|
|
kiwedespars
|
3b92e33112
|
Merge branch 'master' into void-but-for-real
|
2021-03-09 12:29:50 -08:00 |
|
|
kiwedespars
|
3ce6459aef
|
void heretic and many other prs
|
2021-03-09 02:58:34 -08:00 |
|
|
Sneakyrat6
|
d5b0251cb5
|
Merge branch 'master' into matContainer
|
2021-03-09 05:42:47 -05:00 |
|
|
Sneakyrat6
|
703567e591
|
other fixes
|
2021-03-07 04:09:36 -05:00 |
|
|
Letter N
|
22b33d1a6e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-07 13:04:36 +08:00 |
|
|
silicons
|
06f6a7eb46
|
Merge pull request #14360 from Hatterhat/pipegun
pipe shotgun reskins
|
2021-03-06 17:00:15 -07:00 |
|
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
|
Hatterhat
|
fcdebd7d63
|
lets get it
|
2021-03-02 23:19:45 -06:00 |
|
|
Detective Google
|
2ae258d002
|
turtlenecks
|
2021-02-27 04:42:05 -06:00 |
|
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
|
Jay
|
73be04412b
|
Donator Item - Metal Mask
|
2021-02-21 19:57:43 -06:00 |
|
|
Letter N
|
037378eb7d
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-19 10:34:47 +08:00 |
|
|
silicons
|
98d23bb87b
|
Merge pull request #14256 from Adelphon/ppantsg
Polychromic Pants & Jacket
|
2021-02-18 17:41:51 -07:00 |
|
|
silicons
|
e009b9ef5f
|
Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
|
2021-02-17 01:30:13 -07:00 |
|
|
SmArtKar
|
0e1e3aaaed
|
and more
|
2021-02-16 18:57:43 +03:00 |
|
|
SmArtKar
|
799917bc70
|
and more
|
2021-02-16 16:24:37 +03:00 |
|
|
SmArtKar
|
3da4c73fbe
|
Slight changes to balance, new cards
|
2021-02-16 15:57:05 +03:00 |
|
|
Letter N
|
3f40e353aa
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-16 19:41:53 +08:00 |
|
|
Adelphon
|
4c6685333b
|
Polychromic Pants & Jacket
|
2021-02-16 05:24:45 -05:00 |
|
|
SmArtKar
|
cf76b9d740
|
Fixes card saving, fixes some icons, adds rulebook
|
2021-02-16 12:12:20 +03:00 |
|
|
SmArtKar
|
375a6891bf
|
Adds new nuclear cards
|
2021-02-15 19:44:47 +03:00 |
|
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
|
silicons
|
5990a3ad4b
|
Merge pull request #14227 from Adelphon/polycloth
CLOAK, PARKA, COLORFUL SHOES
|
2021-02-13 19:06:46 -07:00 |
|
|
DeltaFire
|
1ea3aafa10
|
Merge pull request #14166 from Hatterhat/ebola-nerf
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
|
2021-02-12 05:06:48 +01:00 |
|
|
Adelphon
|
919e23c122
|
More Clothes
|
2021-02-11 02:36:50 -05:00 |
|
|
Adelphon
|
28d1f93b1c
|
Clothing PR
I added two clothing that I made.
|
2021-02-09 00:41:11 -05:00 |
|
|
Lin
|
7778ddaf96
|
Merge pull request #14195 from Citadel-Station-13/choker
Donator Item - NT Choker
|
2021-02-08 13:56:44 -06:00 |
|
|
Lin
|
fe263ae2ff
|
Merge pull request #13890 from silicons/parry
ablative parry armwraps
|
2021-02-05 23:52:18 -06:00 |
|
|
Jay
|
aba8d2ce2b
|
NT Choker donator item
|
2021-02-05 09:57:19 -06:00 |
|
|
SmArtKar
|
c9e97986c8
|
Patches, fixes, NUCLEAR CARDS
|
2021-02-05 12:13:38 +03:00 |
|
|
SmArtKar
|
3386511150
|
shiet
|
2021-02-04 21:57:07 +03:00 |
|