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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,218 Commits 55 Branches 0 Tags
21c3abdfb7ad02be849653db5a17a043cdced542
Commit Graph

32228 Commits

Author SHA1 Message Date
Hatterhat
20ffbf1a12 backport 2022-10-26 14:02:11 -05:00
IHOPMommyLich
a18577a334 Lowering Threshold 
Lowers the base transfer vote threshold from 3 to 1.
 2022-10-25 23:00:22 -04:00
SandPoot
02e4551a27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-25 22:52:45 -03:00
Lin
ee00bbe52b Merge pull request #15874 from KeRSedChaplain/nothingbroke 
(slab UI bugfix) Don't look at the clockwork slabs on the live server just merge this real quick it's perfectly fine trust me bro 👍
 2022-10-25 04:36:15 +00:00
Lin
03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast 
Fixes deadchat_broadcast
 2022-10-25 04:36:00 +00:00
SandPoot
24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
Jerry Wester
aace737989 Revert "Grant Arachnid Abilities to Driders" 2022-10-19 17:20:52 -06:00
silicons
afed04d2fa Merge pull request #15873 from zeroisthebiggay/tallears 
tall ears from virgo
 2022-10-19 16:15:11 -07: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
zerothebigboy
1f8f5dc071 cocka 2022-10-19 03:49:33 -04:00
Dan-Neposh
274269c2b8 surely my code works every time 2022-10-19 01:32:34 -04:00
BongaTheProto
4a4f4aaa54 Merge branch 'Sandstorm-Station:master' into master 2022-10-18 23:18:56 -05:00
silicons
2ec0e810fc Merge pull request #15869 from JerryWester/feat/drider-webs 
Grant Arachnid Abilities to Driders
 2022-10-18 21:17:03 -07:00
zerothebigboy
2fd981a05a penis 2022-10-18 23:57:02 -04:00
SandPoot
1607d9ead8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-19 00:54:33 -03:00
zerothebigboy
30bf2312f3 seizure 2022-10-18 23:37:40 -04:00
zerothebigboy
fbd3971969 okay 2022-10-17 20:05:44 -04:00
zerothebigboy
b409db3505 yeppers 2022-10-17 19:16:26 -04:00
zeroisthebiggay
591dfbb2b9 Update carbon_defense.dm 2022-10-17 18:49:02 -04:00
deathride58
2d5f5d6c52 Merge pull request #15833 from Hatterhat/cluwne-drop 
drops floor cluwnes (random event max occurrences 0)
 2022-10-16 13:09:21 -04:00
deathride58
ba8af5114e Merge pull request #15861 from shellspeed1/random-whiteship 
Ports random whiteships from tg
 2022-10-16 13:07:07 -04:00
deathride58
fcb90142b3 Merge pull request #15818 from Putnam3145/quark-nerf-2-nerf-harder 
Let's just hard cap QCD research output (per burst)
 2022-10-16 12:38:41 -04:00
deathride58
1c36a35d63 Merge pull request #15840 from Putnam3145/hard-cap-smatter-output 
Hard caps supermatter gas output
 2022-10-16 12:34:37 -04:00
Jerry Wester
e6890c7ea8 dealin' with merge conflicts 2022-10-16 03:18:30 -06:00
BongaTheProto
bad153f1a3 object(s) 
S
 2022-10-15 17:05:06 -05:00
BongaTheProto
5197f5b43e Merge pull request #527 from Nukechickenu64/nukechickens_forge2 
adds incubus and succubus quirks
 2022-10-15 14:55:08 -05:00
Jerry Wester
e513965aba oops, this should be better 2022-10-15 12:01:46 -06:00
BongaTheProto
1d92edeb24 Merge branch 'master' into pathfinder-booty 2022-10-14 14:49:57 -05:00
BongaTheProto
4b0892ba84 Merge branch 'master' into DONUTSDDDDDFSD 2022-10-13 18:30:21 -05:00
BongaTheProto
213c73c91d Merge branch 'master' into pathfinder-booty 2022-10-13 11:21:53 -05:00
BongaTheProto
79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05:00
Jerry Wester
bb6aa48f44 Use is_species, comment out old isarachnid 2022-10-13 02:15:03 -06:00
SandPoot
5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
Jerry Wester
14cbca098f s u c c the cocoon 2022-10-12 11:02:54 -06:00
Jerry Wester
2b30842672 yeah, im arachnophobic 😎 2022-10-12 07:41:20 -06:00
silicons
f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties 
Port of public bounties and the sales tagger from tg.
 2022-10-12 03:27:37 -07:00
silicons
52d91c6d8e Merge pull request #15870 from Hatterhat/organ-recursiorgan 
shoving severed bodyparts (e.g. heads) in smartfridges imparts organ freezing
 2022-10-12 03:27:15 -07:00
BongaTheProto
be212c05c4 Now powered by waze™️ 
this would be helpful in boxed in
 2022-10-11 22:40:57 -05:00
Nukechickenu64
f945deb3f7 Merge remote-tracking branch 'upstream/master' into nukechickens_forge2 2022-10-11 15:47:54 -04:00
Hatterhat
35b8108edb brain freeze head cheese 2022-10-10 21:44:25 -05:00
BongaTheProto
b722359efd new butthole sprite 
squished alt
 2022-10-09 19:17:42 -05:00
shellspeed1
5fc34292c0 fixes resting 2022-10-09 15:45:51 -07:00
silicons
d91100c0f2 Merge pull request #15867 from Hatterhat/fists 
[READY FOR REVIEW] [FRAMEWORK] kinetic brawling - the kinetic gauntlets rework nobody asked for
 2022-10-08 19:57:37 -07:00
silicons
e4d687da0c Merge pull request #15857 from shellspeed1/premium-kas-for-borgs 
Readds the premium ka for borgs
 2022-10-08 15:39:19 -07: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
Jerry Wester
1015987d12 driderman, driderman, does whatever a spider can 2022-10-06 23:38:16 -06:00
Dan-Neposh
a447d337a8 misc balance changes 2022-10-06 00:22:51 -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
Nukechickenu64
9d91bd48bd value fix 
simple value fix
 2022-10-05 01:16:55 -04:00
Nukechickenu64
3060c296e7 cleanup 5 
firfth cleaning of code
 2022-10-04 23:16:09 -04:00