cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,249 Commits 55 Branches 0 Tags
5116acad15f301d528039606cb63af6bff3bbcf2
Commit Graph

4071 Commits

Author SHA1 Message Date
BongaTheProto
5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05:00
SandPoot
7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
BongaTheProto
dcd6fc9850 mmmm noodles 
yum
 2023-05-05 17:11:02 -05:00
Jerry Wester
31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05:00
KrissKr0ss
66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
KeplerWasTaken
1e71db0b70 removed distasteful symbols 2023-04-17 22:27:46 +02:00
Anonymous
3b45414f97 Add new emojis 
No no, not mememotes - emojis.
 2023-04-06 11:31:32 +03:00
BongaTheProto
017c235b4f Merge remote-tracking branch 'upstream/master' 2023-03-14 17:43:38 -05:00
Dexxiol
0f5f654b3a Clothing sprite fixes 
Affected: Cargo uniforms, duffelbags, yoga pants
 2023-03-14 18:01:38 +03:00
BongaTheProto
57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
SandPoot
d63c2ebdd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-05 12:35:35 -03:00
silicons
6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo 
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
 2023-03-04 23:36:36 -08:00
BongaTheProto
308db65f47 Merge pull request #749 from WoolyAypa/booba 
[BOUNTY] Size F to O Sprites for Quad and Sextuple Breast Shapes
 2023-02-27 17:52:13 -05:00
WoolyAypa
1b7ca0718f huge giga impossible massive gigantousblastic max 2023-02-26 21:20:20 -03:00
BongaTheProto
acf6b87535 Merge remote-tracking branch 'upstream/master' 2023-02-24 01:39:26 -05:00
SandPoot
f0dcf824a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-24 01:59:45 -03:00
WoolyAypa
91813ad783 six 2023-02-20 18:26:34 -03:00
BongaTheProto
5ec4443259 Merge remote-tracking branch 'upstream/master' 2023-02-20 11:36:04 -05:00
SandPoot
ca5dddfc29 less weird coloring 2023-02-20 00:44:40 -03:00
SandPoot
2aad51d60b [HURRY-UP] Screentips context help now have advanced, fancy icons (with a way to disable it for only text) (#307) 
* new icon with adjustments for it

* lizard content
 2023-02-19 14:55:14 -03:00
SandPoot
1f6338189a new icon with adjustments for it 2023-02-19 14:29:25 -03:00
SandPoot
09ebd0fddf lizard content 2023-02-19 03:46:36 -03:00
BongaTheProto
b61500c13a followup 2023-02-16 17:04:00 -05:00
BongaTheProto
972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05:00
SandPoot
072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
WoolyAypa
5e09c0a36b quad 2023-02-11 21:38:05 -03:00
Comicao1
fe01f1c5da Veymed limbs (bounty) 2023-02-07 23:46:49 -03:00
SandPoot
b955bc222b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-02-06 20:24:35 -03:00
BongaTheProto
9e9f9915fa Merge remote-tracking branch 'upstream/master' 2023-02-03 17:23:22 -05:00
SandPoot
996e472f80 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-03 18:53:29 -03:00
Timothy Teakettle
7e77bc8023 Merge pull request #15963 from zeroisthebiggay/sickkicks 
sick kicks: tg/skyrat boot sprite theft
 2023-02-03 09:54:04 +00:00
Timothy Teakettle
f40584685b Merge pull request #15952 from zeroisthebiggay/sabre 
very ready sabre resprite and minor sprite tweaks
 2023-02-03 09:53:15 +00:00
Timothy Teakettle
560fbd3ffb Merge pull request #15956 from zeroisthebiggay/posters 
poster resprite bottom text
 2023-02-03 09:52:48 +00:00
zerothebigboy
d93dcf5b76 sickkicks 2023-02-01 08:25:30 -05:00
Timothy Teakettle
c357986b62 Merge pull request #15957 from zeroisthebiggay/wendigo 
the tg wendigo resprite
 2023-02-01 00:53:55 +00:00
Timothy Teakettle
6723c0166e Merge pull request #15960 from zeroisthebiggay/glasses 
the tg gloves resprite
 2023-02-01 00:53:42 +00:00
Timothy Teakettle
2f6d2e838b Merge pull request #15959 from zeroisthebiggay/fire 
new mob fire sprites
 2023-02-01 00:53:29 +00:00
BongaTheProto
7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05:00
zerothebigboy
8dd5986788 okay 2023-01-30 00:06:49 -05:00
zerothebigboy
091d9ec00f good 2023-01-30 00:01:22 -05:00
zerothebigboy
65a0bce02d yeppers 2023-01-29 23:07:37 -05:00
zerothebigboy
c17c7fd53b realest 2023-01-29 22:56:35 -05:00
zerothebigboy
8776b8c0cc epic 2023-01-29 22:35:59 -05:00
zerothebigboy
a7dd149203 shrimple 2023-01-29 22:19:56 -05:00
zerothebigboy
c10b026492 yeah 2023-01-29 22:01:59 -05:00
zerothebigboy
c99b22fe32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre 
# Conflicts:
#	icons/obj/items_and_weapons.dmi
 2023-01-29 21:59:01 -05:00
SandPoot
8ae64b1bd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-29 19:16:50 -03:00
silicons
bb7f6d1766 Merge pull request #15944 from LeDrascol/fix-sprite-drink-filling 
Fix drinking glass sprite issues
 2023-01-29 13:45:48 -08:00
zerothebigboy
73d0395cb5 realest 2023-01-29 08:17:01 -05:00
zerothebigboy
e76221f68b yeppers 2023-01-29 03:57:32 -05:00