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-13 03:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,908 Commits 55 Branches 0 Tags
5029af901b173475bb4d5ce480e89f0ca87d3d3b
Commit Graph

2613 Commits

Author SHA1 Message Date
Putnam3145
975582380b always search when you change paths 2021-07-25 18:52:01 -07:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
silicons
8710731b87 tweaks 2021-07-01 20:42:55 -07:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
LetterJay
3e29f0cccb Update __donator.dm 2021-06-06 20:36:01 -05:00
Jay
14fdfa80f5 pokerchip set donator item 2021-06-06 20:29:29 -05:00
WanderingFox95
9cdc45a905 Bit of this 2021-06-02 15:27:47 +02:00
WanderingFox95
b563e6c2e0 Splits Engineering and Security ORV Suits 2021-06-02 15:25:50 +02:00
Lin
8d9571b863 Merge pull request #14735 from IgiariValkyr/IgiariDonatorFix 
Igiari Donator Item fix
 2021-05-23 14:16:59 -05:00
Igiari
ad6b6b29a0 I'm dumb 2021-05-20 20:08:07 -05:00
Igiari
1485b2fab5 I was told to do this too 2021-05-18 20:19:34 -05:00
Igiari
3de1291dcf Good suggest. 
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-05-18 17:45:55 -05:00
Igiari
27a779da01 It was supposed to be a uniform all along 
Fine, I'll fix it myself
 2021-05-18 13:02:45 -05:00
Timothy Teakettle
5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
silicons
cd0a0bbe5c Update healing.dm 2021-05-06 03:02:46 -07:00
Artur
35bfba1f6a Redoes the variable changes into procs 2021-05-05 18:15:13 +03:00
Artur
92e6646a4c time to make blood even more pain 2021-05-05 14:44:21 +03:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
d32770a0fa test 2021-05-02 22:19:41 +01:00
silicons
cb0574a560 Merge pull request #14649 from TheObserver-sys/BulletPass 
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
 2021-04-28 21:17:55 -06:00
The0bserver
87eee1e15e Why do I do this to myself at 2:22 AM 2021-04-24 02:22:43 -04:00
The0bserver
00f50713eb The fault in my stars 2021-04-24 02:04:21 -04:00
The0bserver
42ed17d2af this too 2021-04-24 00:54:56 -04:00
The0bserver
c7b231637e boxes of ammo, also fire not weapon is bullet 2021-04-24 00:53:57 -04:00
The0bserver
aebca1767e In a station full of bad ideas, these costs were.. 2021-04-23 23:20:16 -04:00
necromanceranne
0a5b587304 Adds fake blindfolds. For reasons. 2021-04-21 12:06:34 +10:00
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