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

47190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darius
dae235f97c Selective mineral machine init_process 
Requested by SandPoot. Disables init_process for mineral (mining) machines, and enables it on a case-by-case basis.

Downstream mineral machines must be updated with this change.
 2022-12-23 16:16:57 -05:00
Darius
b78e728be0 Merge branch 'master' into fix-machine-init-process 2022-12-21 15:05:49 -05:00
SandPoot
32e38d30ad Merge pull request #15898 from Linzolle/linters 
fix linters
 2022-12-17 17:42:23 -03:00
Lin
577c5a0e1e fix linters 2022-12-17 13:26:41 -07:00
Darius
bcae0e66ff Fix init_process not preventing processing 
Prevents machines from running faster when set to both not init_process and not speed_process.

Changes mineral machine to init_process to fix potential issues caused by this.
 2022-12-16 16:25:45 -05: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
723decec2b Merge pull request #15882 from Citadel-Station-13/silicons-patch-16 
updates kate walker's donator item
 2022-12-12 19:13:42 -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
b8e3369d8f Merge pull request #15891 from Mazen421/M421 
Updated Delta Station medical's surgery room
 2022-12-12 19:11:56 -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
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
Lin
c8f52bc5a9 Merge pull request #15889 from Citadel-Station-13/rbmk-bad-return 
Makes RBMK not early return with a prob(80) when there's food on it
 2022-12-12 19:05:21 -07:00
Mazen421
6126a93267 Changed the tools display to surgical tool cases 
Followed Linzolle advice on changing the tools display to a surgical tool case which I found to great advice because it look much nicer and organized
 2022-12-12 13:39:35 +02:00
SandPoot
8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
Mazen421
37e3ddd184 Updated Detla Station's surgery room 
Remolded the medical surgery room and added another surgery table and operating computer.
 2022-12-11 16:54:51 +02:00
Mazen421
2f7b01908e Update Delta Station medical's surgery room 
Heyo,

Remolded the medical surgery room and added another surgery table and operating computer
 2022-12-11 16:21:32 +02:00
Timothy Teakettle
b7673e234f add no hunger no breath 2022-12-09 13:30:10 +00: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
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
silicons
5b954558da Update __donator.dm 2022-11-03 22:50:56 -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