Lin
|
1e66357706
|
Merge pull request #14851 from Vynzill/spritinghell
Extended Armwraps
|
2021-06-16 11:30:01 -07:00 |
|
Vynzill
|
df72710cae
|
herewego
|
2021-06-14 17:19:05 -05:00 |
|
silicons
|
49efd115ee
|
Merge pull request #14832 from zeroisthebiggay/miscsprites
TG Resprite Compendium Atomization Project | Episode Seven: Misc. Resprites & Distinctive Combat Defibs
|
2021-06-13 15:24:30 -07:00 |
|
silicons
|
a91d5111c4
|
Merge pull request #14837 from zeroisthebiggay/trojancoyoteskirt
(held against my will) adds a onesleeved croptop
|
2021-06-13 15:19:37 -07:00 |
|
zerothebigboy
|
319e03476b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites
|
2021-06-13 18:16:08 -04:00 |
|
silicons
|
f56e95e4e7
|
Merge pull request #14841 from MrJWhit/revert-14762-patch-2
Revert "adds cat meteors"
|
2021-06-13 15:15:59 -07:00 |
|
silicons
|
b77da2824a
|
Merge pull request #14830 from zeroisthebiggay/dishdrive
TG Resprite Compendium Atomization Project | Episode Five: Dish Drives
|
2021-06-13 15:14:30 -07:00 |
|
silicons
|
211fed05d7
|
Merge pull request #14829 from zeroisthebiggay/singulohammer
TG Resprite Compendium Atomization Project | Episode Four: Singularity Hammers
|
2021-06-13 15:14:04 -07:00 |
|
silicons
|
33d8e95144
|
Merge pull request #14826 from zeroisthebiggay/bankmachine
TG Resprite Compendium Atomization Project | Episode Two: Bank Machines
|
2021-06-13 15:13:46 -07:00 |
|
MrJWhit
|
a324701730
|
Revert "adds cat meteors"
|
2021-06-13 05:25:02 -04:00 |
|
zerothebigboy
|
a395fc1b52
|
a
|
2021-06-12 19:58:53 -04:00 |
|
zerothebigboy
|
e757f9ea2c
|
thetwentythirdofmany
|
2021-06-12 17:41:09 -04:00 |
|
zerothebigboy
|
3fae79f876
|
thetwentyfirstofmany
|
2021-06-11 20:28:25 -04:00 |
|
zerothebigboy
|
4486b08bd4
|
thefifteenthofmany
|
2021-06-11 19:33:51 -04:00 |
|
zerothebigboy
|
8a5a5ef6cc
|
thethirteenthofmany
|
2021-06-11 19:22:05 -04:00 |
|
zerothebigboy
|
39d951a4a8
|
thesixthofmany
|
2021-06-11 18:24:29 -04:00 |
|
zerothebigboy
|
5bf831be0f
|
thefourthofmany
|
2021-06-11 18:17:16 -04:00 |
|
silicons
|
224efa0e26
|
Merge pull request #14762 from DrPainis/patch-2
adds cat meteors
|
2021-06-09 11:21:55 -07:00 |
|
silicons
|
eb4b4088f4
|
Merge pull request #14760 from keronshb/floorcluwneport
Ports Floor Cluwnes and Cluwnes.
|
2021-06-09 11:21:22 -07:00 |
|
silicons
|
3d86ce9bda
|
Merge pull request #14787 from WanderingFox95/WanderingFox95-ORV-Revamp
ORV Uniform Revamp
|
2021-06-09 11:17:06 -07:00 |
|
silicons
|
c0e3b8d5ef
|
Merge pull request #14809 from SandPoot/speak-nice-yes
Centralizes borg speech and uses some of the icons for the typing indicator
|
2021-06-09 11:15:01 -07:00 |
|
silicons
|
716c2a04e4
|
Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
|
2021-06-09 11:10:17 -07:00 |
|
SandPoot
|
b0940456f5
|
upload files
|
2021-06-08 13:13:22 -03:00 |
|
WanderingFox95
|
d8e31af507
|
And the Icons themselves
|
2021-06-02 15:31:19 +02:00 |
|
WanderingFox95
|
505dd3399f
|
Inventory Icons
|
2021-06-02 15:30:13 +02:00 |
|
keronshb
|
f9be173f08
|
Fixes the shoes?
Maybe?
|
2021-05-31 22:25:32 -04:00 |
|
keronshb
|
70926f5daf
|
Merge remote-tracking branch 'upstream/master' into floorcluwneport
|
2021-05-31 22:21:34 -04:00 |
|
Lin
|
9aeb71c296
|
Merge pull request #14761 from silicons/getflaticon
Fixes camera image taking
|
2021-05-28 12:37:09 -05:00 |
|
silicons
|
e1efdb7937
|
Merge pull request #14750 from keronshb/swagoutfitport
Ports Swag outfit from /tg/
|
2021-05-27 21:26:52 -06:00 |
|
DrPainis
|
903ff69621
|
adds a sprite for cat meteors (it's just a copy of the space cat sprite)
|
2021-05-27 12:19:51 -04:00 |
|
silicons
|
3c42247870
|
fix
|
2021-05-26 20:19:47 -07:00 |
|
keronshb
|
78db6bd5c2
|
Ports Floor Cluwnes
Oh fuck oh god
|
2021-05-26 21:58:35 -04: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 |
|
silicons
|
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 |
|
silicons
|
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 |
|
silicons
|
898d1d2c7f
|
Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink
The E-Fink (Yes, really)
|
2021-05-18 17:08:58 -06:00 |
|
zerothebigboy
|
78464695a8
|
KILL
|
2021-05-18 19:02:34 -04:00 |
|
zerothebigboy
|
fff719c408
|
KILL
|
2021-05-18 18:47:12 -04:00 |
|