shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,140 Commits 5 Branches 0 Tags
a0cbb5247916a74d8956567c2bf13d2dfd6bb603
Commit Graph

47140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lin
a0cbb52479 slash -> claw 2022-12-12 19:10:50 -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
silicons
24d687627e Merge pull request #15880 from Hatterhat/point-card-expansion 
mining point cards but they suck less
 2022-11-03 22:52:26 -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
silicons
14bee50a85 Merge pull request #15877 from IHOPMommyLich/master 
Lowering the Transfer Vote Threshold.
 2022-10-26 13:47:48 -07: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
silicons
ae14a58923 Merge pull request #15871 from Citadel-Station-13/ciupdate 
Updates DreamAnnotate to v2
 2022-10-18 21:16:34 -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
deathride58
5bcd1fe2ae Updates DreamAnnotate to v2 2022-10-12 21:49:46 -04:00
Changelogs
c3a4c48b86 Automatic changelog compile [ci skip] 2022-10-13 01:04:40 +00:00
CitadelStationBot
50691d856d Automatic changelog generation for PR #15860 [ci skip] 2022-10-12 05:27:42 -05: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
CitadelStationBot
90af3187e0 Automatic changelog generation for PR #15870 [ci skip] 2022-10-12 05:27:18 -05: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
Changelogs
b6196917bc Automatic changelog compile [ci skip] 2022-10-10 01:05:49 +00:00
shellspeed1
5fc34292c0 fixes resting 2022-10-09 15:45:51 -07:00
CitadelStationBot
95a1107868 Automatic changelog generation for PR #15867 [ci skip] 2022-10-08 21:57:40 -05: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
Changelogs
81d41ce289 Automatic changelog compile [ci skip] 2022-10-09 01:01:20 +00:00
CitadelStationBot
3d59ea6283 Automatic changelog generation for PR #15857 [ci skip] 2022-10-08 17:39:22 -05: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
CitadelStationBot
1d3328e5fa Automatic changelog generation for PR #15868 [ci skip] 2022-10-08 17:38:01 -05:00
silicons
83fcdda850 Merge pull request #15868 from KeRSedChaplain/clockbalance 
misc clockcult balance changes
 2022-10-08 15:37:58 -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
SandPoot
3f04b95ba9 Merge pull request #15866 from Citadel-Station-13/revert-15824-why-is-it-like-this 
Revert "Allow AI, mime, clown to have the same name as LITERALLY ANY MOB IN THE WORLD(???)"
 2022-10-02 12:46:32 -03: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
987fb89cc7 Merge pull request #15865 from Citadel-Station-13/revert-15858-auxmos-2 
Revert "Updates auxmos to 2.0.0"
 2022-09-28 05:32:31 -07:00
silicons
93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00