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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,041 Commits 55 Branches 0 Tags
c9e97986c855af2d1f00a45741e5645d476a64ac
Commit Graph

26864 Commits

Author SHA1 Message Date
SmArtKar
c9e97986c8 Patches, fixes, NUCLEAR CARDS 2021-02-05 12:13:38 +03:00
SmArtKar
1b4072a1b6 Well, reverts illegal cards not saving. Fuck it 2021-02-04 22:36:46 +03:00
SmArtKar
6c92e99899 desc 2021-02-04 22:13:59 +03:00
SmArtKar
dedb2d2c6c CI again... 2021-02-04 22:13:23 +03:00
SmArtKar
24619344f5 Traitor/nuke ops cards no longer count as real cards in binders(they are cheap knock-offs like come on nobody will believe that its a real card) 2021-02-04 19:08:35 +03:00
SmArtKar
2135a391dc More cards? More cards! 2021-02-04 19:03:03 +03:00
SmArtKar
2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
SmArtKar
c202914b65 FUUUUUUUUUUUUCK YOUUUUUU 2021-02-04 17:50:56 +03:00
SmArtKar
9d82e18308 Removal of junk 2 2021-02-04 17:36:10 +03:00
SmArtKar
7a5ee6f668 Removal of junk 2021-02-04 17:35:27 +03:00
SmArtKar
a8fa3ba4e1 fucked up 2021-02-04 17:28:10 +03:00
SmArtKar
a6376fbf3d slight balance 2021-02-04 17:27:48 +03:00
SmArtKar
348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
SmArtKar
41d6ab6b07 REEEEEEEEEE 2021-02-03 16:50:23 +03:00
SmArtKar
5c3d134e6e Actually adds binders as well 2021-02-03 16:46:08 +03:00
SmArtKar
b0c63ea547 Fuck you and your persistence system 2021-02-03 16:43:05 +03:00
SmArtKar
76831f27fb I WANT TO RIP WHOEVER CODED THIS FUCKING CI 2021-02-02 18:32:13 +03:00
SmArtKar
c54a408d81 Fuck you CI 2021-02-02 16:24:43 +03:00
SmArtKar
f554b92702 Centcom fix 2 2021-02-02 16:16:19 +03:00
SmArtKar
1e8203e9c7 Centcom fix 2021-02-02 16:10:17 +03:00
SmArtKar
7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
silicons
7c535fb503 Merge pull request #14149 from timothyteakettle/caw-and-gekker 
adds 'clucks', 'caws' and 'gekkers' to the speech verb list
 2021-01-29 07:30:13 -07:00
silicons
540b8c280b Merge pull request #14156 from zeroisthebiggay/cooming 
hair ports part two | now featuring skrell hair
 2021-01-29 07:29:46 -07:00
silicons
e417d72703 Merge pull request #14150 from zeroisthebiggay/ohgodohfuck 
a zero pr that didn't need a followup pr to fix bugs doesn't exist | adds the multicolor berets to loadout
 2021-01-29 07:29:39 -07: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
silicons
4e446bf894 Merge pull request #14154 from timothyteakettle/stop-encoding-twice 
i broke adminpms and this fixes them sorry
 2021-01-28 16:49:51 -07:00
zerothebigboy
0bc3c5292c arooga 2021-01-28 12:31:23 -05:00
Timothy Teakettle
938b924a37 yes 2021-01-28 11:12:27 +00:00
zerothebigboy
c6420ae433 fuck 2021-01-27 22:59:44 -05:00
Timothy Teakettle
a7445316ef Update flavor_misc.dm 2021-01-28 02:11:08 +00:00
Timothy Teakettle
337611a372 Merge remote-tracking branch 'upstream/master' into caw-and-gekker 2021-01-28 02:10:11 +00:00
silicons
1d72a574b2 Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout 
loadout part 3: custom names and descriptions
 2021-01-27 19:09:41 -07:00
silicons
a973a3b088 Merge pull request #14145 from zeroisthebiggay/aeughfuck 
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
 2021-01-27 19:08:25 -07:00
Timothy Teakettle
e130e9c7e2 Update flavor_misc.dm 2021-01-28 02:08:19 +00:00
silicons
912b09d33b Merge pull request #14146 from zeroisthebiggay/ooffuck 
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
 2021-01-27 19:08:19 -07:00
silicons
af3b237846 Merge pull request #14147 from timothyteakettle/fix-miner-bedsheet 
fixes miner bedsheet
 2021-01-27 19:08:00 -07:00
silicons
f623dde8df Merge pull request #14142 from zeroisthebiggay/sexmask 
adds aesthetic sterile masks (and the paper mask) to the loadout panel
 2021-01-27 19:07:45 -07:00
zerothebigboy
e7d8021b81 a 2021-01-27 18:46:11 -05:00
Lin
b1b5adb90d Merge pull request #14086 from Citadel-Station-13/silicons-patch-25 
officially adds the functionality to insert holdable mobs into colormate
 2021-01-27 17:18:29 -06:00
Lin
f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3 
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
 2021-01-27 17:16:44 -06:00
Lin
4e3a4a30c3 Merge pull request #14139 from Citadel-Station-13/silicons-patch-2 
small refactor to pinpointers, allow pinpointers with custom targets
 2021-01-27 17:16:09 -06:00
zerothebigboy
ee74f2c06c here comes fetish content 2021-01-27 15:38:34 -05:00
Timothy Teakettle
6d6b232afe i hate shitcoders 2021-01-27 20:33:14 +00:00
zerothebigboy
f3072433ff thankyoubasedrp 2021-01-27 14:56:26 -05:00
zerothebigboy
ad2864f137 aeughfuck 2021-01-27 13:30:44 -05:00
Putnam3145
2765aed0b4 Merge pull request #14085 from Citadel-Station-13/silicons-patch-24 
ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
 2021-01-26 22:24:57 -08:00
Putnam3145
8b9551b39c Merge pull request #14056 from Citadel-Station-13/silicons-patch-14 
disables rotatium due to it being horifically bugged and unmaintained
 2021-01-26 22:24:14 -08:00
zeroisthebiggay
0bc8c9383c Update miscellaneous.dm 2021-01-26 13:17:44 -05:00
zerothebigboy
7b2a6955cc please 2021-01-26 13:13:09 -05:00
silicons
0a5ad34fd6 Update pinpointer.dm 2021-01-26 07:26:59 -07:00