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 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,745 Commits 55 Branches 0 Tags
a87e4533e583f0168e166bd509005bdc59d96908
Commit Graph

2888 Commits

Author SHA1 Message Date
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql 
Removes bsql 2
 2021-03-03 00:53:46 -07:00
Lin
195d05b051 Merge pull request #14343 from Hatterhat/thanks-jay 
no more nt chokers society has progressed past the need for nt chokers
 2021-03-02 15:09:39 -06:00
Hatterhat
28833b67b8 you guys are not gonna fucking believe this 2021-02-28 21:09:41 -06:00
Letter N
573f86e223 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-28 09:07:35 +08:00
Detective Google
0d2eef3cc4 for everyone 2021-02-27 04:45:23 -06:00
Detective Google
2ae258d002 turtlenecks 2021-02-27 04:42:05 -06:00
Letter N
59990abd25 grr 2021-02-27 08:41:54 +08:00
dzahlus
b2b8534edc im fucking retarded thinking that was balanced 2021-02-24 18:50:12 +01:00
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Lin
5517678780 Merge pull request #14286 from Citadel-Station-13/metalmaskDonator 
Donator Item - Metal Mask
 2021-02-22 11:15:37 -06:00
Jay
73be04412b Donator Item - Metal Mask 2021-02-21 19:57:43 -06:00
silicons
f581d8c8e0 Merge pull request #14264 from dzahlus/pain-emote-updates 
Pain emote is now added to getting wounded! As well as more pain sounds
 2021-02-21 14:56:26 -07:00
silicons
4ba9df18de Merge pull request #14279 from Adelphon/boon 
bugfix
 2021-02-21 14:53:39 -07:00
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd 
More arousal logging; adds back aphro/nympho
 2021-02-21 14:50:32 -07:00
Letter N
0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08:00
Adelphon
f795d007a9 bugfix 2021-02-20 18:18:27 -05:00
silicons
c70b9bb58d Merge pull request #14260 from timothyteakettle/undeleted-query 
fixes the 'undeleted query' message at the start of every shift
 2021-02-20 03:02:15 -07:00
Putnam
257cd6bb34 keyword argument funnies, whoops comma 2021-02-18 21:55:28 -08:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
silicons
98d23bb87b Merge pull request #14256 from Adelphon/ppantsg 
Polychromic Pants & Jacket
 2021-02-18 17:41:51 -07:00
dzahlus
bf61249fcd new pain sounds 2021-02-18 04:38:02 +01:00
Timothy Teakettle
76b4d4a7dc Update mentor.dm 2021-02-16 21:02:35 +00:00
Adelphon
4c6685333b Polychromic Pants & Jacket 2021-02-16 05:24:45 -05:00
Letter N
a17716be5b bye 2021-02-16 18:15:02 +08:00
Lin
142be853dc Merge pull request #14245 from silicons/sprint_staging 
adds config entry for sprint removal that works prettier than just setting sprint speed to 0
 2021-02-14 22:52:44 -06:00
silicons
2ef33c5c88 sprint updates 2021-02-13 20:24:26 -07:00
silicons
5990a3ad4b Merge pull request #14227 from Adelphon/polycloth 
CLOAK, PARKA, COLORFUL SHOES
 2021-02-13 19:06:46 -07:00
dzahlus
816ee5f61c Merge branch 'master' into cm13-pain-emote 2021-02-11 23:42:42 +01:00
dzahlus
a5f7718fe1 PLEASE I BEG YOU 2021-02-11 15:03:02 +01:00
Adelphon
919e23c122 More Clothes 2021-02-11 02:36:50 -05:00
dzahlus
bbcc0a5a0d fixes travis error hopefully 2021-02-11 01:57:56 +01:00
silicons
c9d917b22d Merge pull request #14201 from dzahlus/flechette-buff 
Flechette Rifle/CX Shredder now work with wounds
 2021-02-10 02:09:38 -07: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
dzahlus
7da856ebef remove bleed 
haha forgot this for a second
 2021-02-07 17:09:35 +01:00
dzahlus
601305426f wounds now work 2021-02-07 17:08:06 +01:00
silicons
cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound 
Diversify weapon sound
 2021-02-06 11:42:36 -07:00
Fermi
f236b2da29 Merge branch 'master' into Dispencer-UI-change 2021-02-06 02:40:27 +00:00
Jay
aba8d2ce2b NT Choker donator item 2021-02-05 09:57:19 -06:00
dzahlus
2322652d48 haha oops forgotthis existed 2021-02-05 13:04:11 +01:00
dzahlus
f51c3a0d2b heehoo forgot crediting 2021-02-04 20:05:01 +01:00
dzahlus
80b607f7bd *pain 
AAWHG! Adds pain emote and respective sounds for male and female
 2021-02-04 19:59:57 +01:00
DeltaFire
ee7c45fe77 Merge pull request #14031 from Putnam3145/fermi-emp-fix 
Fixes fermichem EMPs being massive.
 2021-01-30 18:44:20 +01:00
zeroisthebiggay
90bd136dad Update modular_citadel/code/modules/client/loadout/head.dm 
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com>
 2021-01-29 07:38:37 -05:00
zerothebigboy
c6420ae433 fuck 2021-01-27 22:59:44 -05: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
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
zerothebigboy
f3072433ff thankyoubasedrp 2021-01-27 14:56:26 -05:00
zeroisthebiggay
4b6f0d3ffa Update mask.dm 2021-01-26 14:11:00 -05:00