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
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
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
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
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
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
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
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
30236578c9
If you write a comment make sure the line's right
2022-12-05 20:26:12 -08:00
b820b61a48
Make QCD not generate infinite science
2022-11-28 23:54:50 -08:00
b747ab56f4
Pins, New Loadout Category, CTRLclick for accessory above suit
2022-11-17 20:58:31 -07:00
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
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
bab984be30
i hate runtimestation i hate runtimestation
2022-10-31 11:50:54 -05:00
4a8abd0843
Revert "no more free money ( #15375 )"
...
This reverts commit cb1848d06c
2022-10-31 00:01:44 -05:00
4900a28c00
Merge pull request #15862 from Citadel-Station-13/stuff
...
adds multiline /me emotes
2022-10-26 16:49:31 -04:00
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
03c62f4359
Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
...
Fixes deadchat_broadcast
2022-10-25 04:36:00 +00:00
24ee6077c7
push changes
2022-10-23 00:18:03 -03:00
aace737989
Revert "Grant Arachnid Abilities to Driders"
2022-10-19 17:20:52 -06:00
afed04d2fa
Merge pull request #15873 from zeroisthebiggay/tallears
...
tall ears from virgo
2022-10-19 16:15:11 -07:00
1f8f5dc071
cocka
2022-10-19 03:49:33 -04:00
274269c2b8
surely my code works every time
2022-10-19 01:32:34 -04:00
2ec0e810fc
Merge pull request #15869 from JerryWester/feat/drider-webs
...
Grant Arachnid Abilities to Driders
2022-10-18 21:17:03 -07:00
2fd981a05a
penis
2022-10-18 23:57:02 -04:00
30bf2312f3
seizure
2022-10-18 23:37:40 -04:00
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
ba8af5114e
Merge pull request #15861 from shellspeed1/random-whiteship
...
Ports random whiteships from tg
2022-10-16 13:07:07 -04:00
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
1c36a35d63
Merge pull request #15840 from Putnam3145/hard-cap-smatter-output
...
Hard caps supermatter gas output
2022-10-16 12:34:37 -04:00
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
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
35b8108edb
brain freeze head cheese
2022-10-10 21:44:25 -05:00
5fc34292c0
fixes resting
2022-10-09 15:45:51 -07:00
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
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
1015987d12
driderman, driderman, does whatever a spider can
2022-10-06 23:38:16 -06:00
a447d337a8
misc balance changes
2022-10-06 00:22:51 -04:00
282cc819dc
works on my machine
2022-10-04 20:10:09 -05:00
38bd037b66
box that mf up
2022-10-04 14:14:04 -05:00
93e8a69c4c
Revert "Updates auxmos to 2.0.0"
2022-09-28 01:05:10 -07:00
2b2aa28207
this is better
2022-09-25 20:00:36 -07:00
142c07c51d
Merge branch 'master' into premium-kas-for-borgs
2022-09-23 17:00:02 -07:00
c6d908f578
Update say.dm
2022-09-23 16:27:24 -07:00
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
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
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
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
ef38bc5522
Merge pull request #15858 from Putnam3145/auxmos-2
...
Updates auxmos to 2.0.0
2022-09-23 16:20:31 -07:00
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
Lin