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
41,685 Commits 55 Branches 0 Tags
1d8533c1cd777fd337d373843036ba3b4f31f4e7
Commit Graph

2004 Commits

Author SHA1 Message Date
Detective Google
2ae258d002 turtlenecks 2021-02-27 04:42:05 -06:00
Jay
73be04412b Donator Item - Metal Mask 2021-02-21 19:57:43 -06:00
silicons
98d23bb87b Merge pull request #14256 from Adelphon/ppantsg 
Polychromic Pants & Jacket
 2021-02-18 17:41:51 -07:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
SmArtKar
0e1e3aaaed and more 2021-02-16 18:57:43 +03:00
SmArtKar
799917bc70 and more 2021-02-16 16:24:37 +03:00
SmArtKar
3da4c73fbe Slight changes to balance, new cards 2021-02-16 15:57:05 +03:00
Adelphon
4c6685333b Polychromic Pants & Jacket 2021-02-16 05:24:45 -05:00
SmArtKar
cf76b9d740 Fixes card saving, fixes some icons, adds rulebook 2021-02-16 12:12:20 +03:00
SmArtKar
375a6891bf Adds new nuclear cards 2021-02-15 19:44:47 +03:00
silicons
5990a3ad4b Merge pull request #14227 from Adelphon/polycloth 
CLOAK, PARKA, COLORFUL SHOES
 2021-02-13 19:06:46 -07:00
DeltaFire
1ea3aafa10 Merge pull request #14166 from Hatterhat/ebola-nerf 
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
 2021-02-12 05:06:48 +01:00
Adelphon
919e23c122 More Clothes 2021-02-11 02:36:50 -05:00
Adelphon
28d1f93b1c Clothing PR 
I added two clothing that I made.
 2021-02-09 00:41:11 -05:00
Lin
7778ddaf96 Merge pull request #14195 from Citadel-Station-13/choker 
Donator Item - NT Choker
 2021-02-08 13:56:44 -06:00
Lin
fe263ae2ff Merge pull request #13890 from silicons/parry 
ablative parry armwraps
 2021-02-05 23:52:18 -06:00
Jay
aba8d2ce2b NT Choker donator item 2021-02-05 09:57:19 -06:00
SmArtKar
c9e97986c8 Patches, fixes, NUCLEAR CARDS 2021-02-05 12:13:38 +03:00
SmArtKar
3386511150 shiet 2021-02-04 21:57:07 +03:00
SmArtKar
2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
SmArtKar
348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
zerothebigboy
50a47f56bb i forgot a sprite 2021-02-03 11:51:50 -05:00
SmArtKar
7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
Hatterhat
4525b1b64f ooOOooOO today i wont test my code again 2021-01-29 20:19:58 -06:00
silicons
1974f2b41d Merge pull request #14148 from zeroisthebiggay/whytho 
gives the advanced extinguisher a sprite that doesn't look like total dogshit even by codersprite standards
 2021-01-29 07:29:28 -07:00
MrJWhit
5a75028889 neck 2021-01-27 23:17:36 -05:00
zerothebigboy
e7d8021b81 a 2021-01-27 18:46:11 -05:00
zerothebigboy
ee74f2c06c here comes fetish content 2021-01-27 15:38:34 -05:00
zerothebigboy
f3072433ff thankyoubasedrp 2021-01-27 14:56:26 -05:00
silicons
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513 
[READY] somatoray buff - mutation locks + revolution ray
 2021-01-25 23:17:29 -07:00
Hatterhat
cbc19c7e91 depcards not in lockers 2021-01-23 19:37:39 -06:00
silicons
718cb3f501 Merge pull request #14092 from BlueWildrose/Timidwomen 
Adds Timid wo/man costumes
 2021-01-20 15:21:06 -07:00
Hatterhat
a8cb8b79c6 for one, dont forget the sprites, dumbass 2021-01-19 17:40:34 -06:00
Hatterhat
fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
Blue Wildrose
88c21942d0 Merge branch 'master' into Timidwomen 2021-01-18 14:42:52 -07:00
Blue Wildrose
fd69938884 Tired of these motherfucking merge conflicts on this motherfucking PR 2021-01-18 14:31:40 -07:00
Blue Wildrose
381f27c5b1 will this work? 2021-01-18 14:28:16 -07:00
Blue Wildrose
b2f036de6b Fuck merge conflicts icons are fucking annoying 2021-01-18 14:22:27 -07:00
Blue Wildrose
0c139970c8 merge conflict resolution attempt 2021-01-18 14:16:45 -07:00
Blue Wildrose
a49f98aac8 attempting to resolve merge conflict 2021-01-18 14:12:30 -07:00
Blue Wildrose
c79177ab07 Adds Timid wo/man outfits 2021-01-18 13:42:38 -07:00
silicons
4099e57f4e Merge pull request #13963 from necromanceranne/robocoat 
Mostly ports tgstation #54644; New roboticist labcoat sprites
 2021-01-17 20:43:24 -07:00
silicons
2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel 
Nanogel for robotic limbs
 2021-01-17 20:42:19 -07:00
necromanceranne
5b5bc85b8f Fixes conflicts AGAIN 2021-01-16 04:58:47 +11:00
silicons
aa830b257a Merge pull request #13975 from zeroisthebiggay/paramed 
resprites paramedic softsuit to not violate r*d cr*ss copyright and resprites the paramedic closet
 2021-01-13 16:58:04 -07:00
DeltaFire
f591bff85b sprite stuff 2021-01-12 23:54:40 +01:00
DeltaFire
13beddd42b nanogel time 2021-01-12 23:02:44 +01:00
kappa-sama
f3e328af03 hot sauce 2021-01-12 10:04:56 -05:00
kappa-sama
c751f114aa finally 2021-01-12 01:42:55 -05:00
necromanceranne
6d10ca9efa Fixes missing sprites on the steelwood bokkens, fixes further problems with crafting bokken parts 2021-01-10 05:43:33 +11:00