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
ShamanSliph
140cf9340f Merge branch 'master' into moth-quirks 2022-11-03 14:47:02 -04:00
JimmyDrop
afae6597da Flutter Beta 
Changes
-If check in space mob_movement/spacemovement
-Defined TRAIT_FLUTTER
-Added Flutter quirk
 2022-11-03 14:25:26 -04:00
WoolyAypa
c489ffba47 newline ngmhmgnfnmhgf 2022-11-03 00:28:12 -03:00
WoolyAypa
ea0ebe589e Holy Mace (cleric mace but better) 2022-11-03 00:18:44 -03:00
BongaTheProto
ba0caf5d20 Merge branch 'master' into player-narrate 2022-11-02 12:24:24 -05:00
BongaTheProto
412270d777 Update qareen_bliss.dm 2022-11-02 11:47:52 -05:00
BongaTheProto
5ad37de2d9 Merge branch 'master' into player-narrate 2022-11-01 23:25:59 -05:00
BongaTheProto
9fccefa50f Merge pull request #584 from NopemanMcHalt/local-contributor-does-a-bruh_alt 
A poor attempt to de-duplicate "Set Gender" verb code
 2022-11-01 22:04:20 -05:00
BongaTheProto
b50f04aa05 Merge pull request #560 from Nukechickenu64/vampirefix 
vampire update
 2022-11-01 21:45:14 -05:00
BongaTheProto
976a826155 more sprets 
yeahfe
 2022-11-01 19:41:40 -05:00
BongaTheProto
66f74e6faa pnarrate 
/me but uhhhhh idk
 2022-11-01 18:19:22 -05:00
Anonymous
343e2f3745 Adds neighbor PR idea and suggestion edits 
Co-authored-by: Zirok-BYOND <108930384+Zirok-BYOND@users.noreply.github.com>
 2022-10-31 16:30:15 +03:00
Anonymous
77897e6856 Makes "Set Gender" into proc 
Verbs remain as-is, just function now handled as a shared proc.
 2022-10-31 16:27:21 +03:00
BongaTheProto
908c42bcf6 Merge pull request #572 from KathrinBailey/furniture 
Fixes Fancy Sofa
 2022-10-31 01:35:54 -05:00
Nukechickenu64
1b8c636783 give them bloodsucker language 2022-10-30 22:59:14 -04:00
BongaTheProto
63f460c9de Merge pull request #582 from LonoferaRS/man_nipplesjpg 
New job titles for Cook and Detective
 2022-10-30 20:35:16 -05:00
Lonofera
4ace0917b9 New job titles for Cook and Detective 2022-10-31 01:56:34 +03:00
BongaTheProto
f1707c4d56 Update neutral.dm 2022-10-30 14:16:15 -05:00
BongaTheProto
d2df45e0bd Merge branch 'master' into pr/560 2022-10-30 14:13:50 -05:00
BongaTheProto
9f6f860905 Merge pull request #569 from Satile1/HotelRework 
Hotel rework
 2022-10-30 13:38:18 -05:00
BongaTheProto
15bfb4f302 module and organize 
and so we can merge
 2022-10-30 13:28:57 -05:00
BongaTheProto
27c4b9113d Merge pull request #547 from KathrinBailey/mapping2 
New Boxstation random engines!
 2022-10-30 11:25:03 -05:00
KathrinBailey
b1987edd4c Update sofa.dm 2022-10-30 13:18:52 +00:00
BongaTheProto
039a5644e5 Update modular_splurt/code/datums/traits/neutral.dm 2022-10-28 21:41:02 -05:00
Nukechickenu64
7793f47019 Update neutral.dm 2022-10-28 19:26:21 -04:00
Nukechickenu64
ab01ab2372 Update neutral.dm 2022-10-28 19:23:58 -04:00
BongaTheProto
995bf17146 Merge pull request #559 from zeroisthebiggay/patch-2 
hypothetically allows you to leash cowbells and maid collars for erotic purposes
 2022-10-28 17:49:52 -05:00
Nukechickenu64
0a5b478f2e Update modular_splurt/code/datums/traits/neutral.dm 
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2022-10-28 18:38:09 -04:00
BongaTheProto
94aa34f7be Merge pull request #537 from JerryWester/arachnid-trait 
Arachnid trait
 2022-10-28 16:49:48 -05:00
Nukechickenu64
45c0198396 finishing up 2022-10-26 04:03:43 -04:00
Nukechickenu64
54440e8bf2 Merge branch 'vampirefix' of https://github.com/Nukechickenu64/S.P.L.U.R.T-Station-13 into vampirefix 2022-10-26 02:25:58 -04:00
Nukechickenu64
2114dd0541 cleaning a little 2022-10-26 02:19:53 -04:00
Nukechickenu64
30299cdd23 Merge branch 'master' into vampirefix 2022-10-26 02:18:01 -04:00
Nukechickenu64
e6398495e9 fix stupid shjt 2022-10-26 02:03:36 -04:00
Nukechickenu64
78735b2a94 slight weakness for balance 2022-10-26 01:57:55 -04:00
KathrinBailey
b3b4cbc74b Update sofa.dm 2022-10-26 03:49:55 +01:00
KathrinBailey
443732367a Fixes corp sofas 2022-10-26 03:31:35 +01:00
Anonymous
3d6dd65335 Yet Another Alt Title 
This time for HoS - Commissar.
 2022-10-23 19:14:56 +03:00
Satile1
50ff01d57c Rewords important notes, adds headsets 2022-10-23 13:44:41 +01:00
Satile1
9ccaaa9070 New Hotel v2 2022-10-23 11:11:52 +01:00
BongaTheProto
528eb83474 Merge pull request #534 from Nukechickenu64/nukechickens-werewolf-testing 
adds werewolf quirk
 2022-10-22 19:45:58 -05:00
BongaTheProto
eaa5bdf411 Merge pull request #542 from AshTheDerg/fix-cog 
Cog Changes and Fixes
 2022-10-22 17:05:50 -05:00
BongaTheProto
fae92e5321 Merge pull request #564 from NopemanMcHalt/loadout_additions-1234 
Adds apron, overalls and Amish suit to loadout
 2022-10-22 12:30:07 -05:00
Anonymous
8e25f92aa6 Adds "waiter" alt title 
this is last change to PR i promise
 2022-10-22 12:11:32 +03:00
Anonymous
0ea4be5ad0 Removes modular "Off-Duty" title 
Upstream added it, don't @ me.
 2022-10-22 11:58:07 +03:00
Anonymous
863b46b7e6 Adds apron, overalls and Amish suit to loadout 2022-10-22 11:38:53 +03:00
Anonymous
63b7b84990 Alt titles changes 
- Removes "Rookie" as an alt title for Security Officer;
 - Adds "Bridge Intern" as an alt title for Bridge Officer.
 2022-10-22 11:20:38 +03:00
zeroisthebiggay
3a6adcef6f Update leash.dm 2022-10-22 02:42:09 -04:00
zeroisthebiggay
d59c142435 Update leash.dm 2022-10-22 01:38:31 -04:00
Nukechickenu64
f508db0ec2 Merge remote-tracking branch 'upstream/master' into vampirefix 2022-10-22 00:39:23 -04:00