shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,981 Commits 5 Branches 0 Tags
5bf4afcadefd3933237dcfe4f131b35564d5da22
Commit Graph

1708 Commits

Author SHA1 Message Date
Iatots
e81d1abf03 Add files via upload 2020-07-23 20:15:48 +02:00
silicons
9f66163d4f Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20 
Ports several food sprites/foods from Baystation/Citadel RP
 2020-07-23 10:35:30 -07:00
silicons
ec72015f4f Merge pull request #12809 from BlackMajor/borgo 
Gripper brained. The medborg can do chemistry now, oh no.
 2020-07-23 10:35:16 -07:00
silicons
ce87d3e8c5 Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly 
ports tg radiation suits and also makes syndiekrav gloves actually visually distinct
 2020-07-23 10:28:44 -07:00
silicons
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port 
ports part 1 of tg wounds
 2020-07-23 10:25:25 -07:00
zerothebigboy
9f657a2030 a 2020-07-22 04:17:20 -04:00
zerothebigboy
1d6e0e3a16 a 2020-07-22 04:15:21 -04:00
zerothebigboy
7870d90de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radiationsuitsareugly 
# Conflicts:
#	icons/mob/clothing/hands.dmi
#	icons/mob/clothing/head.dmi
#	icons/obj/clothing/gloves.dmi
#	icons/obj/clothing/hats.dmi
 2020-07-22 01:03:55 -04:00
silicons
744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent 
maid fetish content pr
 2020-07-21 19:20:52 -07:00
zerothebigboy
75c87077ec a 2020-07-21 17:22:35 -04:00
zerothebigboy
8b4aa20693 a 2020-07-21 17:11:17 -04:00
zerothebigboy
fb35248e3b a 2020-07-21 02:24:22 -04:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Winter Flare
e416a2377e Merge branch 'master' into foodport-p2-7/12/20 2020-07-19 18:58:52 -04:00
Winter Flare
506ddd83fe Meatloaf, Meatball sub, fixes. 2020-07-18 22:16:19 -04:00
Winter Flare
89ecaf3b82 Potato Meals, Sweet and Sour. 2020-07-18 20:53:16 -04:00
Winter Flare
2effbf4db0 Fixes Spiral, and Cracker Box 2020-07-18 18:53:47 -04:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
BlackMajor
f68962e9d3 This is a bad idea 2020-07-18 16:46:08 +12:00
timothyteakettle
74b2764591 sprites and some missed things 2020-07-18 03:08:03 +01:00
CameronWoof
36d25b178a arcade tickets got lost in the resolution 2020-07-17 17:35:15 -07:00
CameronWoof
431c52b7e2 Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh 2020-07-17 17:22:43 -07:00
silicons
04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells 
snail shell backpack
 2020-07-17 17:07:46 -07:00
Winter Flare
61f4fbc67a Merge branch 'master' into foodport-p2-7/12/20 2020-07-17 19:27:50 -04:00
Winter Flare
5611e23584 Update Spiral Soup sprite 2020-07-17 18:54:17 -04:00
Arturlang
92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
CameronWoof
a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
Winter Flare
d6413d5559 Adds Cracker Box, Soup 
Fixes stray pixels on some sushi sprites.
Adds Spiral Soup, Bear Chili
Adds Cracker Box
 2020-07-14 22:43:34 -04:00
Timothy Teakettle
0a4a0fadb3 snails 2020-07-14 20:59:25 +01:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Ragolution
1a67201921 Adds new icon for Bluespace Jar 2020-07-12 20:03:50 -04:00
Winter Flare
c92d88d794 Nuggie Box Shift 
Shifts Chicken Nugget Boxes down 4 pixels.
 2020-07-12 19:56:17 -04:00
silicons
31da81aff4 Merge pull request #12217 from Putnam3145/putnamos-for-real 
The real fastmos: C++ monstermos port
 2020-07-09 20:37:18 -07:00
Artur
9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
silicons
bf4936cb02 Merge pull request #12707 from Chiirno/slimebrain 
Resprited brains into a new slime core sprite for jelly people.
 2020-07-09 02:26:27 -07:00
silicons
9828d6fe85 Merge pull request #12700 from KeRSedChaplain/POSTRATVAR 
Post This Ratvar, OR how I regained my contributor role in one simple step, OR how I buffed clock cult unknowingly.
 2020-07-08 22:51:36 -07:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
silicons
6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar 
bluespace tray + bluespace jar
 2020-07-08 03:10:44 -07:00
Keate Senior
150a31a584 new and improved, less jarring poster 
as it says on the tin, makes the text static on the sprite
 2020-07-07 19:56:46 -04:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Cirno
fe45971e43 Added a slime core in the place of brains for jelly people 2020-07-07 12:05:06 -03:00
silicons
4fa7a461ef Merge pull request #12684 from Owai-Seek/foodport-p1-7/1/20 
Food ports, tweaks, and fixes.
 2020-07-06 17:19:07 -07:00
Keate Senior
4ee72305d0 Post This Justiciar 
sprites and object
 2020-07-06 06:34:38 -04:00
Winter Flare
482785d922 Fixes Bee Balm 2020-07-05 19:14:03 -04:00
Ghom
22d0e7ee0b Merge pull request #12672 from Sonic121x/patch-3 
add crushed sodacan and some digitigrade uniform sprite.
 2020-07-03 19:59:36 +02:00
Artur
f0154f3f1c conflicts!!! 2020-07-03 15:45:11 +03:00
Artur
82c6a02feb More Testmerge fixes 2020-07-03 15:34:45 +03:00
Winter Flare
5b923623d3 Sprite Updates + Food Ports 
Ports/Adds, or updates the sprites for:
Cooked Carp
Bear Steaks
Raw and Cooked Chicken
Raw Meatball (Unused, adding for future PR)

Ports:
Chili Cheese Fries
Margarine
BLT (In next Commit)

Fix:
Tuna Sandwich now uses 5u Mayo, instead of 5 jars of mayo.
Tuna Sandwich is now visible.
 2020-07-03 08:33:01 -04:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Sonic121x
bf1544ce87 Add a crshued state for soldry soda can. 2020-07-02 23:26:18 +08:00