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
42,634 Commits 55 Branches 0 Tags
c2b7140ddd67147a6bcd088c46d35d1135e87112
Commit Graph

2536 Commits

Author SHA1 Message Date
Blue Wildrose
a7726aa383 re-enlarging the value 2021-04-01 06:07:25 -07:00
Blue Wildrose
e7099c67a1 oh right some fucker at cargo would abuse this. 2021-04-01 05:45:26 -07:00
silicons
d58697c78d Merge pull request #14505 from timothyteakettle/the-most-important-pr 
the loadout now recognises collars as polychromic items
 2021-03-24 19:23:58 -06:00
Timothy Teakettle
7d4284b086 Update neck.dm 2021-03-23 21:33:50 +00:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box 
Bark Box Remastered Edition
 2021-03-22 21:15:14 -06:00
silicons
7bd2727d58 Merge pull request #14458 from GrayRachnid/particle-defender 
Buffs the Warden's Particle defender to something that isn't pure dumpster trash
 2021-03-20 14:28:26 -06:00
ItzGabby
68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby
3fed89b16d fixthedamnballs 2021-03-19 02:01:37 -04:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
silicons
f6f2c27e90 Merge pull request #14442 from SandPoot/master 
Adds the skirt variant of the "Tactitool Turtleneck" to the loadout
 2021-03-18 06:40:51 -06:00
silicons
e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real 
[HERETICS] Void & a handful of heretics-related PRS
 2021-03-18 06:38:40 -06:00
GrayRachnid
1f668a0473 lowers number of shots back to 8 from 10 2021-03-17 14:11:50 -04:00
GrayRachnid
679d00f787 rebalances after further testing 2021-03-17 13:48:21 -04:00
GrayRachnid
508210e3ec buffs particle defender 2021-03-17 13:01:49 -04:00
SandPoot
5d13d61ea7 upload files 2021-03-15 11:11:17 -03:00
Jay
e4ab673e4a Adds Shrine Maiden outfit for donator 2021-03-14 18:40:01 -05:00
kiwedespars
56b0a49902 brain is like monkey, it forgets the newlines 2021-03-11 21:32:11 -08:00
kiwedespars
e145bdafe8 adds domain expansion 
- adds domain expansion, final spell for void heretics
- makes clap1 into an emote
- makes cleave a little more enticing with two guaranteed critical wounds and brute damage
- buffs void mark
 2021-03-11 21:26:58 -08:00
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
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