 siliconsandGitHub
|
e1efdb7937
|
Merge pull request #14750 from keronshb/swagoutfitport
Ports Swag outfit from /tg/
|
2021-05-27 21:26:52 -06:00 |
|
keronshb
|
d7ae90eb13
|
Digitigrade vers
|
2021-05-24 13:33:12 -04:00 |
|
keronshb
|
77d302f8f6
|
Ports Swag Outfit
|
2021-05-24 12:47:55 -04:00 |
|
 siliconsandGitHub
|
eba3f554bc
|
Merge pull request #14737 from zeroisthebiggay/KILL
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
|
2021-05-23 08:52:25 -06:00 |
|
zerothebigboy
|
25c99bb23c
|
fuckihatecoding
|
2021-05-22 11:52:55 -04:00 |
|
zerothebigboy
|
43228f96cf
|
kinu
|
2021-05-22 09:35:43 -04:00 |
|
zerothebigboy
|
37c3bc23a8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair
# Conflicts:
|
2021-05-22 07:21:02 -04:00 |
|
zerothebigboy
|
1d3a60ee69
|
inari
|
2021-05-21 23:52:25 -04:00 |
|
zerothebigboy
|
af24fef322
|
inari
|
2021-05-21 20:46:48 -04:00 |
|
zerothebigboy
|
aaad98725f
|
best i gonna get
|
2021-05-20 19:59:57 -04:00 |
|
zerothebigboy
|
f54c893748
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair
|
2021-05-20 18:57:51 -04:00 |
|
keronshb
|
58cb278327
|
Missing errors and icons
|
2021-05-19 15:09:56 -04:00 |
|
zerothebigboy
|
bc61ada440
|
KILL
|
2021-05-19 13:24:40 -04:00 |
|
 siliconsandGitHub
|
d0bb22da5f
|
Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two
ports rp's marking system
|
2021-05-19 08:02:59 -06:00 |
|
zerothebigboy
|
e7c0dea497
|
actually an eris hairdo
|
2021-05-18 22:04:59 -04:00 |
|
zerothebigboy
|
89b2d74895
|
actually an eris hairdo
|
2021-05-18 22:00:35 -04:00 |
|
zerothebigboy
|
78464695a8
|
KILL
|
2021-05-18 19:02:34 -04:00 |
|
zerothebigboy
|
fff719c408
|
KILL
|
2021-05-18 18:47:12 -04:00 |
|
zerothebigboy
|
20ac75020d
|
steponmycock
|
2021-05-18 17:23:07 -04:00 |
|
zerothebigboy
|
2a3eb07bfd
|
steponmycock
|
2021-05-18 16:57:52 -04:00 |
|
 WanderingFox95andGitHub
|
6a78b3555f
|
Inhands
|
2021-05-17 12:26:48 +02:00 |
|
timothyteakettle
|
34869215e8
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-14 01:59:32 +01:00 |
|
 siliconsandGitHub
|
e8b7abcfc6
|
Merge pull request #14664 from WanderingFox95/WanderingFox95-TheUnrollingPin
The Unrolling Pin! (Ready)
|
2021-05-07 18:40:33 -06:00 |
|
Timothy Teakettle
|
5bc33c222a
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-08 01:28:23 +01:00 |
|
Timothy Teakettle
|
ba71bb944a
|
im not crazy but this commit breaks 90% of the game
|
2021-05-05 18:11:05 +01:00 |
|
Timothy Teakettle
|
7f611ebdc2
|
apparently avian sprites are needed
|
2021-04-30 14:12:59 +01:00 |
|
Timothy Teakettle
|
ac504d679b
|
digi humans
|
2021-04-30 14:07:44 +01:00 |
|
 WanderingFox95andGitHub
|
85d252544f
|
You can even see the unrolling pin in your hand!
|
2021-04-26 18:47:43 +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
|
db9c538c97
|
Fixed female slimesubspecies left/right sprites being flipped
who the heck messed this up
|
2021-04-09 22:35:59 -07:00 |
|
 EricandGitHub
|
08c89f421a
|
updates telescopic bat inhand sprites
|
2021-04-03 17:07:25 -05:00 |
|
 EricandGitHub
|
2a5d756034
|
Add files via upload
Adds inhand sprites for Telescopic bat.
|
2021-03-28 22:40:50 -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 |
|
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 |
|
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 |
|
 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 |
|