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
73,824 Commits 5 Branches 0 Tags
d16f39cc10cc18e8362dfe6fb82a9f51228edecb
Commit Graph

1687 Commits

Author SHA1 Message Date
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Atermonera
08cc205c35 Merge pull request #7503 from Cyantime/patch-2 
Replaces cable attack_ghost with normal examine
 2020-08-20 22:24:32 -04: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
SplinterGP
9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Razgriz
8a66fef929 Merge pull request #418 from BlackMajor/Please-memory-may-I-have-some-more 
Misc memory improvements
 2020-07-22 19:13:15 -07:00
BlackMajor
717a5fa049 aughe 2020-07-23 13:57:39 +12:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Razgriz
aa58ed31dd Phorochem removal test 2020-07-21 13:46:58 -07:00
Killian
5d7cff1f7d areas, closets, other miscellaneous adjustments 2020-07-21 17:29:34 +01:00
Shadow Quill
678e7810cc Adds the field! 2020-07-20 03:17:43 -05:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
Atermonera
736fdab6e3 Merge pull request #7273 from Cyantime/obs 
Observing improvements
 2020-06-24 11:36:18 -04:00
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
Cyantime
d2dad900ad Removes unneeded check 2020-06-06 15:56:47 -04:00
Cyantime
0bff8bfa51 Reduces gravgen alarrm volume 2020-06-05 15:29:11 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Atermonera
5275847404 Fixes particle accelerator construction. (#7232) 
Left is left and right is right.
 2020-05-24 17:32:36 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Atermonera
8cdc792920 Merge pull request #7090 from VOREStation/aro-poismes 
Don't give POI SMES more charge than possible
 2020-05-15 20:56:27 -04:00
Aronai Sieyes
132ace7ab5 Optimize lighting processing 2020-05-13 12:16:01 -04:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai Sieyes
96da7be01b Put APCs and SMESes into GLOB lists to ease iteration 2020-05-11 22:05:41 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Atermonera
40f1198e12 Merge pull request #7059 from atlantiscze/2020_04_28_DelamChange 
Supermatter delamination tweaks
 2020-05-08 15:18:27 -04:00
Aronai Sieyes
f09a9a9a26 Merge pull request #7682 from VOREStation/upstream-merge-7055 
[MIRROR] Updates machines to use default_apply_parts()
 2020-05-07 19:24:13 -04:00
Atermonera
c42e536074 Merge pull request #7088 from VOREStation/pol-smesexamine 
Fix SMES and debug power item examine messages
 2020-05-07 02:00:11 -04:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Aronai Sieyes
1d3ed1441c Merge pull request #7675 from Little-119/NightshiftOverride 
Add a better nightshift control
 2020-05-06 22:51:57 -04:00
Little-119
f5990cfe35 Fix cooldown math while I'm here 2020-05-06 17:50:54 -04:00
Little-119
6f9f3cd897 Add nightshift setting 2020-05-06 17:50:18 -04:00
izac112
f0c35e631e more fixes 2020-05-06 23:07:07 +02:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Aronai Sieyes
a7f9557109 Increase nightmode brightness slightly 2020-05-06 10:35:25 -04:00
Rykka
9ceb5f768b Fix clamp case breaking BYOND versions below 513.1490 
513.1490 added `clamp` as a native proc
 2020-05-06 06:42:36 -04:00
Leshana
f93d50b034 Fix an overcharged smes from breaking charging on other smes. 
An overcharged smes could demand negative power from the grid, swamping other SMES and resulting in zero power being distributed.
 2020-05-04 13:36:53 -04:00
Aronai Sieyes
f270f276bc Allow locked APCs to still toggle night lighting 2020-05-03 21:13:17 -04:00
Aronai Sieyes
47d81e83b2 Merge pull request #7614 from VOREStation/aro-ssnightshift 
Port SSnightshift from Paradise
 2020-05-03 19:00:32 -04:00
Atermonera
77fef98789 Merge pull request #7010 from atlantiscze/2020_04_17_LoadBalancing 
Ports over power-related enhancements and tweaks i coded for Bay a while back
 2020-05-03 18:45:25 -04:00
Aronai Sieyes
aa6d22097b Port SSnightshift from Paradise 
Makes the station have a night mode.
 2020-05-03 17:51:05 -04:00
Leshana
10b0323d6f Use can_atmos_pass to reduce proc-calls in c_airblock() 
- Add additional can_atmos_pass value ATMOS_PASS_PROC which indicates custom behavior requiring calling the CanZASPass proc.
  - The benefit being for the other three values we DON'T need to call CanZASPass at all!  We already know the behavior without the overhead of a proc call.
  - Obviously any atom with can_atmos_pass = ATMOS_PASS_PROC cannot now call ..() in CanZASPass() since the default behavior would be to (recursively) call CanZASPass()
  - This required re-numbering the constants, so I also fixed all code that assumed particular values for the constants.
- Switched all types which overrode CanZASPass with custom logic to be can_atmos_pass = ATMOS_PASS_PROC
- Changed /turf/c_airblock() to skip calling /atom/movable/c_airblock() for the three can_atmos_pass values that don't require calling the proc.
 2020-04-30 14:50:57 -04:00
Leshana
4a2e8bb0c4 Fix return values of CanZASPass 
- CanZASPass is supposed to return boolean.  Nobody noticed this bug because ATMOS_PASS_YES and ATMOS_PASS_NO happen to be defined as 1 and 0.  But thats not a good assumption to make, so lets fix it!
 2020-04-30 14:50:57 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045 
[MIRROR] Removes limits on eating, centralizes nutrition changing.
 2020-04-29 19:23:55 -04:00