cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,451 Commits 9 Branches 0 Tags
1b4cc6b555d310b51e59c24e382eb18e3d94a280
Commit Graph

204 Commits

Author SHA1 Message Date
Casey
f4cd5db137 Merge pull request #13276 from Heroman3003/textbubble-fix 
Fixes speech bubble appearing on blank messages
 2022-07-08 00:28:29 +00:00
Casey
b66a47e086 Input Patches 2022-06-29 06:01:21 +00:00
Nadyr
7643a4222a powder that makes you say yes 2022-06-23 00:16:14 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
a6c21a9adb Communicator Log Fix 2022-06-11 01:04:29 +00:00
Casey
e3b147f3c3 Vision and Phaser Bug Fixes 2022-04-22 22:43:10 +00:00
Casey
5c72239a85 Merge pull request #12696 from Heroman3003/vision-exclusivity 
Makes NIFSoft vision modifiers mutually exclusive with goggle/visor based ones
 2022-04-09 21:50:04 +00:00
Casey
44b45a8e56 Merge pull request #12676 from Runa-Dacino/Mining-Synth 
Organic/Synthethic NIFsoft disk functionality split
 2022-04-07 03:21:59 +00:00
Casey
51bd77e5c2 Firearms 1 2022-03-26 03:56:42 +00:00
Casey
d01ceb18ba Merge pull request #12534 from Verkister/patch-112 
Fixes nif unimplant runtime
 2022-03-25 20:57:29 +00:00
Casey
0ace36e925 Further item bank restrictions 2022-02-07 02:31:46 +00:00
Casey
cd80228460 Merge pull request #11944 from Heroman3003/nifnerf 
Makes NIFs not get automatically lost (hopefully)
 2022-01-09 01:50:59 +00:00
Nadyr
905e5b14dd Merge branch 'master' into upstream-merge-11952 2021-12-12 06:31:20 -05:00
Aronai Sieyes
cd8c0bc4a0 Merge pull request #11823 from Heroman3003/proteannif 
Makes proteans use special NIF subtype
 2021-12-10 01:59:58 +00:00
Casey
27ecae6d41 Makes proteans gib on death 2021-12-04 03:03:50 +00:00
Casey
ae13ff1ed2 Merge pull request #11524 from GhostActual/boxed 
Boxing Day
 2021-09-24 03:21:13 +00:00
Razgriz
f8b4ed5a6c Revert "Reduces the sound volume of the NIF as to not blow your ears out" 2021-09-13 00:07:14 -07:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
lbnesquik
a46299b83a Reduces the sound volume of the NIF as to not blow your ears out 2021-08-08 09:11:03 +02:00
Aronai Sieyes
dfd88b4ba7 Merge pull request #11326 from Verkister/hudbutts 
Fixes the small hud buttons not getting hud colors
 2021-08-02 13:40:43 +00:00
Nadyr
f5a64aae10 powder that makes you say yes 2021-07-20 21:21:25 -04:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Nadyr
19b0e94af7 Merge pull request #2510 from CHOMPStationBot/upstream-merge-11025 
[MIRROR] Fix crafting menu, add plant fiber crafting things
 2021-07-13 22:59:04 -04:00
Chompstation Bot
50dd8ad121 Fix crafting menu, add plant fiber crafting things 2021-07-11 19:16:38 +00:00
Aronai Sieyes
d989caaf41 Merge pull request #11021 from VOREStation/Arokha/nifcraftmenus 
Make nif/crafting menu buttons not be hidden
 2021-07-11 19:14:17 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Aronai Sieyes
b44528c61f Merge pull request #10475 from VOREStation/Arokha/lastlint 
Fix final linting errors
 2021-05-29 18:55:23 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Novacat
a65f821485 Merge pull request #10381 from Verkister/patch-53 
Fixes soulcatcher nifsoft spawning with faulty toggle
 2021-05-23 00:27:44 +00:00
Chompstation Bot
e432a9e7ac Add portable mapping devices 2021-05-22 19:26:57 +00:00
Novacat
86ab1a8363 Merge pull request #10303 from VOREStation/Arokha/removeoldnifmenu 
Deprecate NIF statpanel in favor of TGUI
 2021-05-12 17:46:40 +00:00
Novacat
d318defa59 Merge pull request #10302 from VOREStation/Arokha/joinfixes 
Fix two character spawn bugs
 2021-05-12 04:13:20 +00:00
Novacat
dec9537f54 Merge pull request #10288 from VOREStation/Arokha/nifruntime 
Fix NIF runtime
 2021-05-11 13:05:51 +00:00
Chompstation Bot
9e9452bd2f Readd nif softshop descriptions as tooltips 2021-05-10 07:12:36 -04:00
Nadyr
e0f6cb84c9 Merge branch 'master' into upstream-merge-10050 2021-05-09 06:13:32 -04:00
Nadyr
c6ee2d9072 Merge pull request #1904 from CHOMPStationBot/upstream-merge-10241 
[MIRROR] Makes soulcatcher a pre-installed software
 2021-05-08 07:59:14 -04:00
Aronai Sieyes
c11c46131b Merge pull request #10241 from Heroman3003/free-soulcatchers 
Makes soulcatcher a pre-installed software
 2021-05-06 17:34:08 +00:00
Novacat
81ee7a1007 Merge pull request #10242 from Heroman3003/cost-reduce-ar 
Reduces cost of Sci and Eng AR programs.
 2021-05-05 18:46:41 +00:00
Chompstation Bot
55cb88b4a9 [MIRROR] Ported the Bay/Nebula emote system. 2021-05-05 18:45:31 +00:00
Nadyr
3aed4dee02 Merge branch 'master' into upstream-merge-10123 2021-04-11 06:22:53 -04:00
Nadyr
a494347a7e Merge branch 'master' into upstream-merge-10095 2021-04-11 03:34:32 -04:00
Nadyr
abb0cf342d Merge branch 'master' into upstream-merge-10092 2021-04-10 22:50:33 -04:00
Novacat
aa20186609 Merge pull request #10123 from Novacat/nova-ert 
Ports Chomp fix for Burn/brute nifsoft
 2021-04-10 12:47:05 +00:00
BlackMajor
5a012c3ba3 smh (#1779) 2021-04-10 03:50:13 -07:00
Nadyr
bcf66850c1 Update 15_misc.dm 2021-04-09 02:25:48 -04:00