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-17 13:23:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

1420 Commits

Author SHA1 Message Date
Nukechickenu64
ffe4441f93 Update neutral.dm 2022-10-21 22:54:46 -04:00
Nukechickenu64
0aeb123086 Update neutral.dm 2022-10-21 22:18:44 -04:00
Jerry Wester
0e33e70c72 the great equalizer 2022-10-20 11:24:40 -06:00
Jerry Wester
66dec8b372 i don't have a clever message, can wrap humonkeys 2022-10-19 19:08:40 -06:00
BongaTheProto
91c264dc34 Merge pull request #554 from zeroisthebiggay/okay 
fixes new jobs not displaying properly on suit sensors, fixes peacekeeper pdas and generally debloats them, new job hud updates
 2022-10-19 11:46:33 -05:00
Nukechickenu64
903c905456 stupid fucking bad spelling fix 2022-10-19 03:31:28 -04:00
Nukechickenu64
e212f3d06e update vampire quirk 2022-10-19 03:16:17 -04:00
Nukechickenu64
457d460c3f Update neutral.dm 2022-10-18 23:05:19 -04:00
Nukechickenu64
25da946c95 vampire coffin update 2022-10-18 23:00:33 -04:00
zeroisthebiggay
a8a7ff832e Update leash.dm 2022-10-18 22:10:18 -04:00
zeroisthebiggay
1618b0c7b2 Update leash.dm 2022-10-18 22:10:04 -04:00
zeroisthebiggay
5ea1bd92c3 Update leash.dm 2022-10-18 22:08:11 -04:00
AshTheDerg
1d34d02146 Merge remote-tracking branch 'upstream/master' into fix-cog 2022-10-18 19:12:29 -04:00
Jerry Wester
d009af107f prefbreak alert 2022-10-18 10:17:25 -06:00
Nukechickenu64
7d87812d3d Update modular_splurt/code/datums/traits/neutral.dm 
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2022-10-18 00:39:06 -04:00
Nukechickenu64
621d0c921d shake animation added 2022-10-17 21:33:45 -04:00
BongaTheProto
b28b7c9c3f Merge pull request #553 from zeroisthebiggay/patch-1 
fixes traits grammar generally
 2022-10-17 20:22:38 -05:00
BongaTheProto
5458d503b7 Merge pull request #549 from catrock31/master 
makes the cum bar drink affect the cum based quirks
 2022-10-17 20:15:53 -05:00
BongaTheProto
50a4ae1f07 Merge pull request #535 from JerryWester/jinkies-where-are-my-glasses 
Diagnostic HUD equality
 2022-10-17 20:10:09 -05:00
BongaTheProto
155e872fbb better 
b
 2022-10-17 20:05:26 -05:00
zeroisthebiggay
5e19557c45 Update neutral.dm 2022-10-17 20:57:48 -04:00
zeroisthebiggay
c525cf2061 Update neutral.dm 2022-10-17 20:54:49 -04:00
zeroisthebiggay
269ded2e56 Update neutral.dm 2022-10-17 20:54:15 -04:00
zeroisthebiggay
596e382561 Update neutral.dm 2022-10-17 20:53:20 -04:00
Nukechickenu64
9855d1d5f8 bark fix 2022-10-17 20:43:16 -04:00
BongaTheProto
6f6ea51bde deoxys markings 
yeah
 2022-10-17 19:16:22 -05:00
zerothebigboy
fbd3971969 okay 2022-10-17 20:05:44 -04:00
zerothebigboy
b409db3505 yeppers 2022-10-17 19:16:26 -04:00
zeroisthebiggay
45918b3668 Update negative.dm 2022-10-17 18:43:18 -04:00
zeroisthebiggay
c47e274dca Update good.dm 2022-10-17 18:34:11 -04:00
zeroisthebiggay
050f8ba11e Update neutral.dm 2022-10-17 18:26:30 -04:00
BongaTheProto
c1ad0dec58 Update rope.dm 2022-10-17 12:52:48 -05:00
BongaTheProto
fa0a53a32e fishnet 
and hairb
 2022-10-17 12:26:21 -05:00
Jerry Wester
99f19b7308 Use returns 2022-10-17 03:58:31 -06:00
BongaTheProto
576c50abff dresses 
yeah
 2022-10-16 23:57:53 -05:00
catrock31
43e178b6f6 fixes a small problem 2022-10-17 00:27:11 -04:00
Nukechickenu64
a5ec63baa2 mossy de-autisticing my code 
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2022-10-16 20:12:11 -04:00
Nukechickenu64
018837f42c mossy fixing my retarded shit 
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2022-10-16 20:11:34 -04:00
KathrinBailey
9d15297966 boxstation engines 
two new engines:
diy - blank canvas to build your own stuff
diy_sm - an empty room with a crystal in it, make your own chamber!!

config changes
 2022-10-16 23:06:38 +01:00
catrock31
eb036115f8 makes the cum bar drink affect the cum based quirks 2022-10-16 16:04:54 -04:00
Jerry Wester
c370557a52 Move other HUD implants so they're all in-line 2022-10-16 04:02:28 -06:00
Jerry Wester
e6890c7ea8 dealin' with merge conflicts 2022-10-16 03:18:30 -06:00
Nukechickenu64
18dc346e23 fix 
fixes the upstream update
 2022-10-15 22:47:10 -04:00
Nukechickenu64
9e629284d2 Merge remote-tracking branch 'upstream/master' into nukechickens-werewolf-testing 2022-10-15 22:37:50 -04:00
Nukechickenu64
b95c355406 Update neutral.dm 2022-10-15 22:35:28 -04:00
BongaTheProto
bad153f1a3 object(s) 
S
 2022-10-15 17:05:06 -05:00
BongaTheProto
f0368381b0 Merge pull request #544 from OlyMoley7/Export 
Added Aeromorph wing icons
 2022-10-15 15:58:33 -05:00
OlyMoley7
1e0aff6607 Code cleanup 2022-10-15 16:03:14 -04:00
BongaTheProto
5197f5b43e Merge pull request #527 from Nukechickenu64/nukechickens_forge2 
adds incubus and succubus quirks
 2022-10-15 14:55:08 -05:00
OlyMoley7
176f9c3c03 Aeromorph Wings where they SHOULD be 
Moved the icons into the modular portion of the code and removed it from the base code.
 2022-10-15 14:31:30 -04:00