shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,381 Commits 5 Branches 0 Tags
0a3aa1e94de5a353497af29153126641b9dd9edc
Commit Graph

2112 Commits

Author SHA1 Message Date
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 716c2a04e4 Merge pull request #14160 from keronshb/motivation 
Adds a new traitor item, Motivation (Part 1)
 2021-06-09 11:10:17 -07: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
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
keronshb 78db6bd5c2 Ports Floor Cluwnes 
Oh fuck oh god
 2021-05-26 21:58:35 -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 bc61ada440 KILL 2021-05-19 13:24:40 -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 fff719c408 KILL 2021-05-18 18:47:12 -04:00
WanderingFox95 957f9ddf23 E-fink Icon 2021-05-17 12:24:54 +02:00
zerothebigboy 37873d6750 gommit 2021-05-15 08:52:24 -04:00
silicons 625488891e Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine 
Lavaland Wine: Pinot Mort (Ready)
 2021-05-12 04:43:11 -06:00
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 25fc57cbef Merge branch 'master' into WanderingFox95-LavalandWine 2021-04-29 10:54:18 +02: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
WanderingFox95 5a7a4d39ed Actually adds the icon, too. 
Totally forgot to upload it.
 2021-04-21 15:20:09 +02: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