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-25 01:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,249 Commits 55 Branches 0 Tags
f945deb3f73a5b51ff9afd66e15346aeddb7aae3
Commit Graph

984 Commits

Author SHA1 Message Date
BongaTheProto
054f2aa52d follow-up 2022-09-28 16:08:29 -05:00
Iosyf
06150c97af ignore 2022-09-28 22:15:29 +03:00
Iosyf
f115c2ec0e removing debug info 2022-09-28 21:58:04 +03:00
Iosyf
5780853d53 Merge branch 'master' of https://github.com/Hideyoshi1/Larry_S.P.L.U.R.T-Station-13 2022-09-28 21:29:07 +03:00
Iosyf
5ac223c3f0 Missed a thing for the qareen 
a variable change in the bliss ability code
 2022-09-28 21:28:40 +03:00
Iosyf
33d895376c Merge branch 'SPLURT-Station:master' into master 2022-09-28 21:20:11 +03:00
Iosyf
fda19d3d11 Qareen Almost Completion 
- Added the Qareen to the spawnable antagonists list
- Finished modifications to the "Bliss", "Harvest" and "Malfunction"  abilities
- All that's left now is the manifestation (but I couldn't find any spriters for it so...)
- Probably needs to be balanced
 2022-09-28 21:19:28 +03:00
LamkasDev
4824f205c6 fix: missing return value 2022-09-28 15:11:32 +02:00
BongaTheProto
f0b7bd40a6 follow-up 
because some stuff got ported
 2022-09-27 23:39:10 -05:00
BongaTheProto
89147b792a small update 
yeah
 2022-09-25 19:54:33 -05:00
Kat
4f554bea8e fixed indentation 2022-09-25 09:46:48 +01:00
Kat
0dee531f02 does the thing, new() 2022-09-25 09:10:24 +01:00
Pin-alternative
aa4f226967 hatcharoo 2022-09-25 08:18:47 +10:00
Pin-alternative
c6cc2aa5bb add note, removes unused code 2022-09-24 20:44:24 +10:00
Pin-alternative
0c4645dcb1 whoops 2022-09-24 08:25:37 +10:00
Pin-alternative
9c9cefa8d6 rem 2022-09-24 08:19:17 +10:00
BongaTheProto
45439c0a31 Update drink_recipes.dm 2022-09-22 20:57:01 -05:00
Kat
7d2b8d9e63 Additional access for CE + Engie + Atmos Tech 2022-09-22 15:28:34 +01:00
Pin-alternative
1e0383503e ehh 2022-09-22 19:35:18 +10:00
Pin-alternative
8f84c44235 cooldown, no spam 2022-09-22 18:54:38 +10:00
LamkasDev
1bbde11d56 fix: finish todos (tables, colors, tug, etc.) 2022-09-21 19:01:14 +02:00
ToasterStrudes
7d58ede0c8 Update ipc.dm 2022-09-21 01:01:38 -04:00
ToasterStrudes
1876adfc77 Update ipc.dm 2022-09-21 01:00:48 -04:00
ToasterStrudes
a7a192f78f Update ipc.dm 2022-09-21 00:59:27 -04:00
ToasterStrudes
fc99aa2499 Update ipc.dm 2022-09-21 00:55:48 -04:00
ToasterStrudes
870d044a06 Add files via upload 2022-09-21 00:49:43 -04:00
LamkasDev
841b7444dc feat: add stacking, front/behind target, colors 2022-09-20 19:39:42 +02:00
BongaTheProto
fce1008fb3 Merge pull request #496 from JerryWester/gfluid-emag-fix 
Fix fluid infuser emagging action
 2022-09-20 00:19:31 -05:00
BongaTheProto
c4512018ea Merge pull request #495 from JerryWester/mechfab-shenanigans 
Mechfab Sorting + IPC Organs
 2022-09-20 00:15:17 -05:00
Jerry Wester
f5f2123013 oops, forgot a newline 2022-09-19 22:50:28 -06:00
Jerry Wester
9c66080372 Fix gfluid emag_act 2022-09-19 22:41:30 -06:00
LamkasDev
7fdad4d310 feat: implement basic rope system 2022-09-20 00:24:12 +02:00
BongaTheProto
560c837469 follow-up (aka snap rbmk) 
Except for the parts they didn't port over
9cdaffc417
 2022-09-18 23:43:45 -05:00
Jerry Wester
52cd9f53f0 Remove the vortex cell from the mechfab 2022-09-18 02:47:41 -06:00
Jerry Wester
40d2167a12 Mechfab Sorting + IPC Organs 2022-09-18 02:07:20 -06:00
BongaTheProto
4bc28faf37 New chitter 
for the butter man
 2022-09-16 21:38:02 -05:00
BongaTheProto
35472c001b Merge pull request #477 from LamkasDev/feature_strapon 
Add strapons
 2022-09-16 18:57:26 -05:00
BongaTheProto
3e1f949773 le spriting 
mayhem again
 2022-09-14 16:07:14 -05:00
BongaTheProto
a3c1bb470c Merge pull request #481 from NopemanMcHalt/mememotes2000 
YET ANOTHER BATCH OF MEMEMOTES
 2022-09-13 11:20:33 -05:00
Nopeman McHaltz
9f7085dd21 Increases WTH emote cooldown 
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2022-09-13 18:35:16 +03:00
Kat
494ff98611 ports TG sidings 2022-09-13 11:36:07 +01:00
Anonymous
1c5aed5d98 YET ANOTHER BATCH OF MEMEMOTES 2022-09-12 12:23:18 +03:00
LamkasDev
dfffd5f48b fix: make sure dildos keep type when detached 2022-09-09 19:32:15 +02:00
LamkasDev
bb7ff05a67 fix: add back clownjob long genital names 2022-09-09 19:31:30 +02:00
BongaTheProto
76ef2f1a17 Merge pull request #478 from michaeljacksonlover/sexyperks 
Minor perk rebalance
 2022-09-08 10:48:47 -05:00
LamkasDev
8aa1a96f97 fix: fix wrong strapon interaction checks 2022-09-08 15:41:18 +02:00
SpookyTheFox
7fe23278eb normalized this 
also fixed a spelling/grammar thing in the process
 2022-09-07 19:16:04 -07:00
SpookyTheFox
b129ab5555 change that 
And that should do it, the game should take care of everything else auto-magically.
 2022-09-07 18:42:10 -07:00
SpookyTheFox
639f6c10e9 add the pre-filled implant case 
weird that this seemingly did not exist already
 2022-09-07 18:35:36 -07:00
Mannybrado
6e35fd496b Merge remote-tracking branch 'upstream/master' into sexyperks 2022-09-07 16:59:28 -04:00