cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,759 Commits 5 Branches 0 Tags
f6bcad07df1a585a398be3cc039c8e829756926f
Commit Graph

171 Commits

Author SHA1 Message Date
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
Razgriz
d864dca92b HEV sound code 2020-10-08 13:32:48 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
1cd53493fd Icons for NIFSoft Boxes 2020-09-25 04:40:32 -07:00
ShadowLarkens
bff1c92997 TGUI Communicators 2020-09-17 07:27:14 -07:00
ShadowLarkens
26c295bfb4 TGUI NIFs 2020-09-17 06:40:33 -07:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
ShadowLarkens
951f37d2e3 TGUI Engineering: Squashed Edition (Commits Below) 
TGUI APCs

 TGUI vending machines

 Fix AI default_tgui_interaction

 TGUI Airlocks

 Station & Atmospheric Alert TGUI + Misc NTOS-TGUI Fixes

 TGUI Air Alarms & Central Atmospheric Control

 Airlock TGUI

 TG... got rid of UI for fire alarm. í´·

 TGUI Gas Heating/Cooling System

 TGUI Gas Pump & Passive Gate + Fixes

 TGUI Omni Atmospherics

 TGUI Pipe Dispensers & RPD

 TGUI IntelliCore & Vending Fix

 TGUI Handheld Tanks

 TGUI Portable Pump & Scrubber

 TGUI Tank Dispenser & Canisters

 TGUI Radios

 TGUI SMES & Air Alarm adjustment

 Tweak vending machine interfaces a tad

 TGUI Algae Farm

 TGUI general_air_control

 - Distro & Waste Console
 - Riot Control Console
 - Atmos Intake Console
 - Engine Cooling Console

 TGUI Heavy Scrubber Control (and body scanner fix)

 TGUI trinary devices & shutoff monitor

 TGUI Telecomms Log Browser

 TGUI Telecomms Machine Browser

 TGUI Spaceheater Internal Panel

 TGUI Gravity Generator

 TGUI Id Cards & Fix ID Card Images

 TGUI Id Card Redesign

 TGUI Turbolift

 TGUI Suit Cycler & Suit Storage Unit & Vending Fixes

 TGUI Power Monitor

 TGUI Signalers

 TGUI Employment Records

 TGUI Drone Console

 TGUI RIGSuits

 TGUI PA & PACMAN, and Margin Fix

 TGUI Solar Panels & Fix Power Monitor

 Adjust TGUI modules & their interaction with NTOS

 TGUI RCON

 TGUI Message Monitor

 Bump TGUI line limit to 120 (ParadiseSS13/Paradise#14002)

 TGUI Exonet & NTNet Relay

 TGUI Telecomms Multitool Menu

 TGUI Shield Capacitor & Shield Generator

 TGUI Supermatter-everything & Refactors
 2020-08-09 04:46:31 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
ShadowLarkens
2992efb823 TGUI v4.0 2020-07-17 22:09:26 -07:00
ShadowLarkens
a1eb54e615 Convert all old nano_module crew monitors to TGUI, fix crew monitor for virgo 2020-07-16 18:58:37 -07:00
Razgriz
d500aa1c66 Remove NIF savetofile 
Long shot, but in hopes of fixing a crashing bug involving NIF info saving to character file
 2020-07-15 19:46:01 -07:00