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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,142 Commits 55 Branches 0 Tags
f7ac3c76245f758b11f8d02caed475002c81727c
Commit Graph

30363 Commits

Author SHA1 Message Date
Jerry Wester
f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaos
b538ad721b modsuits part 2 2022-12-11 20:30:58 -07:00
PeriodicChaos
183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
silicons
792790216d Merge pull request #15879 from Hatterhat/revert-15375-golden-jump 
returns NT IRN being able to access dept budgets
 2022-11-03 22:52:45 -07:00
silicons
268184347a Merge pull request #15875 from JerryWester/revert-15869-feat/drider-webs 
Revert "Grant Arachnid Abilities to Driders"
 2022-11-03 22:52:38 -07:00
Hatterhat
bab984be30 i hate runtimestation i hate runtimestation 2022-10-31 11:50:54 -05:00
Hatterhat
4a8abd0843 Revert "no more free money (#15375)" 
This reverts commit cb1848d06c.
 2022-10-31 00:01:44 -05:00
Lin
bf6084f17e Merge pull request #15878 from Hatterhat/patch-1 
hivelord stabilizers on webbing
 2022-10-28 18:45:55 -07:00
deathride58
4900a28c00 Merge pull request #15862 from Citadel-Station-13/stuff 
adds multiline /me emotes
 2022-10-26 16:49:31 -04:00
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
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
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
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
zerothebigboy
30bf2312f3 seizure 2022-10-18 23:37:40 -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
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
Hatterhat
35b8108edb brain freeze head cheese 2022-10-10 21:44:25 -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
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
Hatterhat
282cc819dc works on my machine 2022-10-04 20:10:09 -05:00
Hatterhat
38bd037b66 box that mf up 2022-10-04 14:14:04 -05:00
silicons
d3f05f7830 Revert "Allow AI, mime, clown to have the same name as LITERALLY ANY MOB IN THE WORLD(???)" 2022-10-02 08:44:02 -07:00
silicons
93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
Lin
9d83e5da60 Merge pull request #15824 from Putnam3145/why-is-it-like-this 
Allow AI, mime, clown to have the same name as LITERALLY ANY MOB IN THE WORLD(???)
 2022-09-26 05:23:37 +00:00
VM_USER
2b2aa28207 this is better 2022-09-25 20:00:36 -07:00
shellspeed1
142c07c51d Merge branch 'master' into premium-kas-for-borgs 2022-09-23 17:00:02 -07:00
silicons
c6d908f578 Update say.dm 2022-09-23 16:27:24 -07:00
silicons
a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou 
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
 2022-09-23 16:27:03 -07:00
silicons
b0703d1bd9 Merge pull request #15854 from shellspeed1/borg-radio-improvements 
Ports Adding radio access to borgs by default from splurt. Credit to NopemanMcHalt for the splurt port and Ayfa212 for the initial work.
 2022-09-23 16:26:54 -07:00
silicons
96384ac667 Merge pull request #15856 from shellspeed1/borg-mining-ID-fix-and-premium-KA-return 
Fixes the mining borg point card
 2022-09-23 16:24:36 -07:00
silicons
fbf7a2de90 Merge pull request #15853 from shellspeed1/posialert-console 
Port of the Posialert console from hyper. Credit to jjpark-kb for initial work.
 2022-09-23 16:21:19 -07:00
silicons
c2f1e24223 Merge pull request #15832 from Putnam3145/from-ghost-check 
Makes from-ghost midrounds not roll if no ghosts
 2022-09-23 16:21:08 -07:00
silicons
ef38bc5522 Merge pull request #15858 from Putnam3145/auxmos-2 
Updates auxmos to 2.0.0
 2022-09-23 16:20:31 -07:00
silicons
899c924301 Update text.dm 2022-09-23 16:19:03 -07:00
silicons
a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition 
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
 2022-09-23 16:16:03 -07:00
shellspeed1
dfddbc23c3 ports https://github.com/tgstation/tgstation/pull/53603 Credit to TiviPlus 2022-09-22 01:10:08 -07:00