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-16 04:43:02 +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
Nukechickenu64
f945deb3f7 Merge remote-tracking branch 'upstream/master' into nukechickens_forge2 2022-10-11 15:47:54 -04:00
BongaTheProto
d329d1fe0c Merge pull request #519 from Nukechickenu64/nukechickens_forge 
Bloodsucker Fledgling quirk and quirk ability section in code
 2022-10-10 22:27:52 -05:00
Nukechickenu64
c0645544bf fix my fix lmao 
thanks mos

Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2022-10-09 18:50:21 -04:00
Nukechickenu64
b9486fcfb4 quick fix 
needs nutrition to recoup
 2022-10-09 18:07:53 -04:00
BongaTheProto
683abc2270 Merge branch 'master' into pr/529 2022-10-09 17:01:02 -05:00
BongaTheProto
d0d9aa2296 Update _job_alt_titles.dm 
make it actually limited
 2022-10-09 17:00:58 -05:00
BongaTheProto
3c3601c0fc Merge pull request #530 from SPLURT-Station/new-sprites 
Ayo the sprites are here
 2022-10-08 15:10:01 -05:00
BongaTheProto
c2dae24967 new sprets 
yey
 2022-10-08 15:00:30 -05:00
Lonofera
f389fc5278 Add a limited time Halloween alt-title to security 2022-10-08 19:34:02 +03:00
Nukechickenu64
fa7abd3f34 utter overhaul 
overhauls nearly everything
 2022-10-08 05:51:22 -04:00
Ldip999
34c3d88632 Three basic flower comment 2022-10-07 12:10:16 +02:00
Ldip999
d1b0f0cd6f Medical beret comment 2022-10-07 12:09:53 +02:00
Ldip999
b3c5f397da Bowler hat comment 2022-10-07 12:09:43 +02:00
Ldip999
ccd902b18b Adds flowers 2022-10-07 11:57:18 +02:00
Ldip999
9fdf012722 Adds medical beret 2022-10-07 11:57:11 +02:00
Ldip999
0ad5ed1911 Adds bowler hat 2022-10-07 11:57:01 +02:00
Nukechickenu64
1f5387607f value adjust 
adjust some values and fix my dumness
 2022-10-07 05:50:01 -04:00
Nukechickenu64
3e79d61370 adds incubus and succubus quirks 
incubus needs to eat milk and succubus needs to eat milk, they are compatible with each other and #519
 2022-10-07 05:10:13 -04:00
Nukechickenu64
ab2bd8384e changes 1 
moves things and changes values
 2022-10-05 23:35:47 -04:00
Nukechickenu64
ba78628368 fixes 1 
simple fixes
 2022-10-05 23:04:58 -04:00
Nukechickenu64
37fd47d8f7 modulizing 6 
should be the final commit that modulizes as much as possible
 2022-10-05 18:44:50 -04:00
FLME
d6d662c1ca stressrelief 2022-10-05 13:10:48 -05:00
BongaTheProto
5be7208619 fex 
I think this will work as intended, but with better error handling
 2022-10-05 13:01:47 -05:00
Nukechickenu64
7009e82ebe cleanup 4 
cleaning up more
 2022-10-04 23:00:14 -04:00
Nukechickenu64
abe68a9476 cleanup 2 
more cleaning
 2022-10-04 22:46:51 -04:00
Nukechickenu64
075c7bdbd5 cleanup 2 
cleaning code
 2022-10-04 22:37:30 -04:00
Nukechickenu64
1471bfdd38 cleanup 1 
cleaning code
 2022-10-04 22:34:45 -04:00
Nukechickenu64
1c9ae51b46 the final commit (i hope) 
cleans up some stuff and fixes the desc text for the quirk
 2022-10-04 20:49:58 -04:00
Nukechickenu64
c68e33bd6d modularizition fix 
fixes last commit and makes the action granting more straightforward
 2022-10-04 20:42:12 -04:00
Nukechickenu64
811f3721f7 modularizing bit mroe 
still an error trying to fix
 2022-10-04 19:50:03 -04:00
BongaTheProto
ec61f7c1de Merge pull request #503 from KathrinBailey/engineer_access 
Standardises Engineering Access
 2022-10-03 21:10:00 -05:00
Iosyf
203464c1e0 Merge branch 'SPLURT-Station:master' into master 2022-10-04 01:01:17 +03:00
Iosyf
dc9ad47c84 putting the spawnrate for the qareen to 0 
For until I fix both it and the revenant
 2022-10-04 01:00:05 +03:00
BongaTheProto
fd5cedf535 Update crew_manifest.dm 
woopsie
 2022-10-03 13:05:39 -05:00
BongaTheProto
0a15a43029 Merge pull request #517 from SpookyTheFox/ignoreEgg 
Add the ability to ignore egg polls to ghosts
 2022-10-01 23:03:10 -05:00
Anonymous
60931471bd Changes *omg into *mygod 
Since server-chat doesn't like "omg" due being an Internet slang.
 2022-10-01 22:31:00 +03:00
SpookyTheFox
e86ea13c9e ignore EGG 2022-10-01 12:29:30 -07:00
BongaTheProto
97d86424a3 Update qareen_abilities.dm 2022-10-01 13:18:20 -05:00
BongaTheProto
294aa85641 Merge pull request #515 from SpookyTheFox/cyberpunkJobNames 
Suggestion #3059 Cyberpunk job names
 2022-10-01 12:40:37 -05:00
SpookyTheFox
6c1c280aec someday I'll be paying attention to what I'm doing 
but not today
 2022-10-01 10:09:28 -07:00
SpookyTheFox
17638dec80 whoopsie 
can you believe I went to school for this?
 2022-10-01 10:01:13 -07:00
BongaTheProto
abd2ba473e Merge pull request #508 from Hideyoshi1/master 
Qareen update (almost complete now (needs sprites and a smidge more code (+maybe some re-balancing later)))
 2022-10-01 11:49:38 -05:00
SpookyTheFox
5e87138add add 2077 
the future is now!
 2022-10-01 09:48:55 -07:00
BongaTheProto
1bb56afaf7 Merge branch 'pr/497' 2022-10-01 11:15:23 -05:00
BongaTheProto
c28e3c32d8 Update carbon.dm 2022-10-01 11:15:00 -05:00
BongaTheProto
35e7b31fd5 ugrades 
vent clog no longer in dorms
birfday holiday
pyramidhead costume
 2022-10-01 00:00:13 -05:00
BongaTheProto
49ef05f450 Merge pull request #502 from Pin-alternative/pregchanges 
Pregnancy updates
 2022-09-30 14:09:16 -05:00
BongaTheProto
7cd9f8ebcb Update wings.dm 2022-09-29 19:28:14 -05:00
BongaTheProto
a860147d58 Update wings.dm 
oop
 2022-09-29 19:21:52 -05:00
BongaTheProto
285f6f86ac New body markings 
thx mayem
 2022-09-29 18:50:41 -05:00