cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,880 Commits 6 Branches 0 Tags
04835a42c671f6ac9926e0b71697a43089983dc1
Commit Graph

186 Commits

Author SHA1 Message Date
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
Chompstation Bot
6ce0b7ee4e Make unnatural resizing even better and more efficient with the power of DCS™️ 2021-04-08 15:15:21 +00:00
Chompstation Bot
64990312af Update resize pref and some resizing code 2021-04-07 20:08:32 +00:00
Chompstation Bot
59fdeb2e8e [BUG] Size update fixes 2021-03-12 13:28:52 +00:00
Novacat
4631c4faca Merge pull request #9897 from VOREStation/upstream-merge-7963 
[MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-10 19:40:33 +00:00
Novacat
110dd0e0dc Merge pull request #9545 from Zap-zapper/master 
[FEATURE] Size Related Content Updates
 2021-03-03 16:08:29 +00:00
Razgriz
f3c60621ea Merge pull request #757 from r4d6/Synth-Medichine 
Make the Synth Medichine be more like the organic version
 2020-10-29 16:59:16 -07:00
r4d6
59758b91b7 Add Chomp Edit tags 2020-10-29 05:07:34 -04:00
Razgriz
6a6c527aca Merge pull request #772 from CHOMPStationBot/upstream-merge-9086 
[MIRROR] Allow video calls with NIF commlinks
 2020-10-28 21:37:49 -07:00
Verkister
03ef028939 Merge pull request #9086 from ShadowLarkens/nif_streaming 
Allow video calls with NIF commlinks
 2020-10-28 13:08:54 +00:00
r4d6
e264986f99 Turns out the damage limit is at 30 
Check https://github.com/CHOMPStation2/CHOMPStation2/blob/master/code/modules/organs/organ_external.dm#L429 & https://github.com/CHOMPStation2/CHOMPStation2/blob/master/code/modules/organs/organ_external.dm#L12 for confirmation.
 2020-10-27 11:33:54 -04:00
r4d6
ac7292e393 Add the two needed vay. 2020-10-26 17:29:49 -04:00
r4d6
117ff48625 Update the message yet again. 2020-10-26 17:22:26 -04:00
r4d6
65689ba050 Rename what the NIF said. 2020-10-26 17:12:56 -04:00
r4d6
8ea375a40f Make the Synth Medichine be more like the organic version 2020-10-26 16:53:41 -04:00
Verkister
7c902f6ed6 Merge pull request #9181 from Runa-Dacino/NIF-MassAlteration-Option-No 
Makes it possible to cancel out of Mass Alteration
 2020-10-19 10:40:30 +00:00
Razgriz
253db5340b Do this later 
Figure out how to get the sounds to work for synths
 2020-10-08 18:47:01 -07:00
Razgriz
0f889ebef4 Fix and comments 2020-10-08 14:47:12 -07:00
Razgriz
76db71050c MW4 BB sounds 
Bitching betty sounds from MW4 for synth medichines
 2020-10-08 14:15:06 -07:00