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

20665 Commits

Author SHA1 Message Date
Lin
1401959cc9 Merge pull request #15911 from Hatterhat/prescription 
prescription kits, aka the eyewear accessibility update
 2023-01-01 22:52:21 -07:00
Hatterhat
062cbaed29 wow does that actually compile 2022-12-29 19:34:14 -06:00
Lin
746885b2ae Merge pull request #15901 from Hatterhat/recoil-pref 
[untested] makes recoil screenshake pref save actually
 2022-12-27 17:37:43 -07:00
Lin
66c2dd49e3 Merge pull request #15910 from LeDrascol/port-bluespace-light-replacer 
[PORT] Bluespace Light Replacer
 2022-12-27 17:34:21 -07:00
Hatterhat
50a0991ce3 minor point dupe kill 2022-12-26 12:00:54 -06:00
Hatterhat
3324f3a46c whitespace fix 2022-12-26 09:26:04 -06:00
Hatterhat
d9b431ab91 disposable 2022-12-26 03:53:56 -06:00
Hatterhat
4fa0527ba7 forgot to add The Lore so no lore 2022-12-26 03:46:48 -06:00
Hatterhat
ab827ff8dc accessibility or some shit ig 2022-12-26 03:45:26 -06:00
Hatterhat
05178784d4 sanitize 2022-12-26 01:38:44 -06:00
SandPoot
5ee1e5414f Merge pull request #15895 from Linzolle/claw 
fixes species not using the claw animation for unarmed attacks
 2022-12-24 18:42:09 -03:00
Darius
d3e018720c Port the Bluespace Light Replacer 
- Ports the Bluespace Light Replacer from TG
-- Added to Applied Bluespace Research instead of Advanced Sanitation Technology
- Makes the basic Light Replacer a default tech node
 2022-12-24 15:57:11 -05:00
Hatterhat
3ea2c35832 mismatch 2022-12-23 02:25:26 -06:00
Hatterhat
55826b9eb8 oops 2022-12-20 20:02:28 -06:00
Lin
7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo 
dullahans 2: electric boogaloo
 2022-12-14 19:07:59 -07:00
Lin
2eee8e4339 Merge pull request #15888 from DeltaFire15/revenge-of-the-blacklist 
Roundstart species with a quirk blacklist balance points
 2022-12-12 19:13:32 -07:00
Lin
f758a55da3 Merge pull request #15885 from BlueWildrose/pins 
Pins, New Loadout Category, CTRLclick for accessory above suit
 2022-12-12 19:12:53 -07:00
Lin
7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song 
Solves some harddels
 2022-12-12 19:11:49 -07:00
Lin
a0cbb52479 slash -> claw 2022-12-12 19:10:50 -07:00
Lin
7411453408 Merge pull request #15887 from Putnam3145/fix-qcd 
Make QCD matter not react infinitely, thus generating 200,000 science per second
 2022-12-12 19:06:10 -07:00
Lin
d2fb075a3a Merge pull request #15890 from LeDrascol/no-max-age 
Separate character max age into max generated and max input
 2022-12-12 19:06:02 -07:00
SandPoot
8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
Darius
f5cf485321 Separate max age from max age input 
The maximum character age a user can manually input is now defined by AGE_MAX_INPUT instead of AGE_MAX. These values are identical by default.

Also reverts the change to dialog box text.
 2022-12-09 08:00:19 -05:00
Darius
7321d42ea5 Reduce max age from INFINITY to SHORT_REAL_LIMIT 
This effectively reduces the cap to 16777216.
 2022-12-08 05:38:47 -05:00
Darius
0924175001 Remove maximum age 
Allows characters to be any age above the minimum. Does not remove or change AGE_MAX definition.
 2022-12-08 03:46:32 -05:00
Putnam3145
30236578c9 If you write a comment make sure the line's right 2022-12-05 20:26:12 -08:00
DeltaFire
4beb8ce636 roundstart species balance points 2022-12-03 20:35:23 +01:00
Putnam3145
b820b61a48 Make QCD not generate infinite science 2022-11-28 23:54:50 -08:00
Cognition
b747ab56f4 Pins, New Loadout Category, CTRLclick for accessory above suit 2022-11-17 20:58:31 -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
deathride58
4900a28c00 Merge pull request #15862 from Citadel-Station-13/stuff 
adds multiline /me emotes
 2022-10-26 16:49:31 -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