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

315 Commits

Author SHA1 Message Date
BongaTheProto
f1ed056576 Merge remote-tracking branch 'upstream/master' 2022-09-28 15:26:54 -05:00
NullFag
723d2c8d0f Adds jumpskirt peeking (#264) 2022-09-28 16:16:06 -03:00
BongaTheProto
e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
NullFag
74e9e4e38b Lizard genitalia (#263) 
* shit

* h
 2022-09-27 22:46:50 -03:00
NullFag
812fcc7e54 New markings and frills (#262) 2022-09-27 12:47:59 -03:00
BongaTheProto
49055a7fef Merge branch 'Sandstorm-Station:master' into master 2022-09-08 10:34:50 -05:00
SandPoot
2ed861f2d7 bunch of code optimizations 2022-09-08 03:02:06 -03:00
SandPoot
2f92e8e4ca removes defunct code 2022-09-08 02:31:20 -03:00
Pin-alternative
32018d15dc Merge remote-tracking branch 'upstream/master' into cursed 2022-08-02 10:26:30 +10:00
Turtle567
482a2a3374 Fixed typo 
Chaplain alternate job title, "Bichop" is now "Bishop"
 2022-07-26 19:41:11 -05:00
BongaTheProto
6398d42cad oop! modularize 2022-07-26 00:13:15 -05:00
BongaTheProto
217a4f0dac Merge pull request #413 from Turtle567/master 
Buffed Hiero Club, Chipped King Goat
 2022-07-25 23:59:07 -05:00
Turtle567
4f9a50b2c7 Buff Hiero Club, Chipped King Goat 
Added +10 damage to all of the hierophant clubs attacks and raised their cooldown by a few seconds, this was needed as the hierophant club was hot ass previously.

Brought the King Goat to the vet and chipped him, he can now be found on any GPS with the "Regal Signal"
 2022-07-25 16:47:28 -05:00
Pin-alternative
5c44cad61e Merge remote-tracking branch 'upstream/master' into cursed 2022-07-25 20:35:54 +10:00
BongaTheProto
b074c85078 Updates tea paths for hydration (#261) 2022-07-24 14:30:05 -03:00
BongaTheProto
75189180b4 Update drink_reagents.dm 2022-07-24 12:15:50 -05:00
Pin-alternative
58eac01841 Merge remote-tracking branch 'upstream/master' into cursed 2022-07-17 20:57:03 +10:00
BongaTheProto
8edee48740 Merge remote-tracking branch 'upstream/master' 2022-07-15 18:57:20 -05:00
SandPoot
abc70a16dd kills possible timer subsystem killer and stupid code that doesn't stop overflowing overlays for **** sake 2022-07-15 20:04:42 -03:00
Pin-alternative
ba1c639b58 Merge remote-tracking branch 'upstream/master' into cursed 2022-07-05 20:42:15 +10:00
BongaTheProto
45a1b8d623 Merge branch 'Sandstorm-Station:master' into master 2022-07-02 12:33:19 -07:00
SandPoot
4037765e4c turns out this was wrong, cool! 2022-07-02 13:14:32 -03:00
Pin-alternative
55068b24f0 Merge remote-tracking branch 'upstream/master' into cursed 2022-06-30 14:55:06 +10:00
BongaTheProto
385b4efc5d Merge branch 'master' into pr/340 2022-06-20 01:25:23 -05:00
Pin-alternative
407989f08b Merge remote-tracking branch 'upstream/master' into cursed 2022-06-14 19:43:07 +10:00
BongaTheProto
03f4c65fc4 Merge remote-tracking branch 'upstream/master' 2022-06-11 23:25:29 -05:00
SandPoot
07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
AshTheDerg
8ccd6dec67 Peacekeeper Redo 2022-06-10 23:52:22 -04:00
Pin-alternative
79ab402216 Merge remote-tracking branch 'upstream/master' into cursed 2022-06-10 07:45:46 +10:00
BongaTheProto
6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
SandPoot
78b4d94c96 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:00:44 -03:00
Pin-alternative
64cbd81e9c Merge remote-tracking branch 'upstream/master' into cursed 2022-06-07 17:10:33 +10:00
BongaTheProto
2e8d1a3566 fixes tea 2022-06-04 21:22:42 -05:00
BongaTheProto
04d9c7d167 Merge remote-tracking branch 'upstream/master' 2022-06-04 13:25:54 -05:00
SandPoot
461bfc3f9c Fixing some stuff about sizecode (#257) 2022-06-03 19:45:19 -03:00
Pin-alternative
b3b70bb319 Merge remote-tracking branch 'upstream/master' into cursed 2022-05-30 20:09:20 +10:00
Pin-alternative
c0f224efff some more crap 2022-05-28 20:18:09 +10:00
BongaTheProto
c0530b3650 Merge branch 'master' into prefs-update 2022-05-19 10:48:20 -05:00
BongaTheProto
2a481ecea8 Merge branch 'Sandstorm-Station:master' into master 2022-05-19 08:42:54 -07:00
SandPoot
d0022f08bc No. 2022-05-19 11:57:25 -03:00
BongaTheProto
3df6ff68cf Merge branch 'master' into prefs-update 2022-05-18 21:07:24 -05:00
BongaTheProto
a0e02ce288 Merge branch 'Sandstorm-Station:master' into master 2022-05-18 18:53:09 -07:00
BongaTheProto
78c722f20a Fixes lust saves and adds stepping logs (#252) 2022-05-18 22:45:32 -03:00
BongaTheProto
b59cbac7a0 Update sif.dm 
I hate these too but I hate even more the unnecessary warnings in my vscode
 2022-05-09 07:27:55 -05:00
BongaTheProto
6306d05a18 Merge branch 'master' into prefs-update 2022-05-08 15:23:53 -05:00
Toxici11i
8f91555dd7 Massive update. 
Signed-off-by: Toxici11i
 2022-05-06 22:29:33 +01:00
BongaTheProto
b21f3bc3e6 this somehow works, ok? 
aaa
 2022-05-06 15:42:19 -05:00
Anonymous
9ae44ab1ee Modularizes Alt Job Titles of the SPLURT 
(I just wanted to add Bard alt title wtf happening Edition)
 2022-05-01 22:09:42 +03:00
NopemanMcHalt
67416cce60 Adds "bard" as an alternative assistant title 
Lazy webedit Edition
 2022-05-01 20:18:05 +03:00
BongaTheProto
479b497b00 ok 2022-04-19 01:30:44 -05:00