cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,441 Commits 8 Branches 0 Tags
00bc513e6eb47ecc8d9faaab31a85c6c54d7c4f8
Commit Graph

1566 Commits

Author SHA1 Message Date
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Novacat
49ef2d2ee9 Merge pull request #8848 from Cyantime/spaceweirdness 
Remove gravity from debris field and rogue mining zones
 2020-11-14 06:49:05 +00:00
Razgriz
548c123e77 Merge pull request #760 from CHOMPStationBot/upstream-merge-9225 
[MIRROR] [MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 02:15:15 -07:00
Verkister
9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 08:16:29 +00:00
Nadyr
4835643840 Merge pull request #586 from cadyn/blitzrods 
Blitz rods
 2020-10-24 01:07:02 -04:00
Nadyr
fc677c62e9 Merge pull request #725 from CHOMPStationBot/upstream-merge-9220 
[MIRROR] [MIRROR] Tesla ball and containment field shock fixes
 2020-10-22 10:04:24 -04:00
Nadyr
9205e50340 Merge pull request #724 from CHOMPStationBot/upstream-merge-9221 
[MIRROR] [MIRROR] Make the tesla ball eventually run out of energy
 2020-10-22 10:03:06 -04:00
Nadyr
63d9df53b8 Update solar.dm 
Fixes upstream conflicts
 2020-10-22 09:47:30 -04:00
Verkister
68b59b03fb Merge pull request #9220 from VOREStation/upstream-merge-7702 
[MIRROR] Tesla ball and containment field shock fixes
 2020-10-19 10:40:00 +00:00
Verkister
56bd71350b Merge pull request #9221 from VOREStation/upstream-merge-7703 
[MIRROR] Make the tesla ball eventually run out of energy
 2020-10-19 10:39:52 +00:00
Chompstation Bot
7cdf3fed9d [MIRROR] Fix solar trackers sometimes vanishing when deconstructed 2020-10-19 10:39:21 +00:00
Cadyn
e14dd48263 Blitz rods 2020-10-14 16:14:40 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
4b83c18fb7 Merge pull request #9071 from VOREStation/upstream-merge-7660 
[MIRROR] Fix duplicate results from analyzing some objects
 2020-09-21 16:54:29 -04:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
Meghan-Rossi
cbfd4789d7 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 07:18:35 -04:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
ShadowLarkens
0f7d2b6e00 TGUI Turbine 2020-09-20 01:11:45 -07:00
ShadowLarkens
66b28a69ab TGUI Battery Rack 2020-09-20 00:50:02 -07:00
SplinterGP
7bf3fc31bc Removes nanoUI autolathe code stuff. 2020-09-15 19:06:46 -03:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Novacat
e1f1b2a5b9 Merge pull request #8892 from Cyantime/patch-3 
Enables the construction of battery rack circuits from APC circuits
 2020-09-05 01:10:51 -04:00
lbnesquik
abd819b0b4 Allow inducers to interact with APC's. 
Probably.
 2020-09-03 21:13:04 +02:00
Repede
1aed482d7d Fixes some M << to to_chat references. 2020-09-01 23:16:25 -04:00
Cyantime
867ae862f5 Enables the construction of cellrack circuits 2020-08-28 20:48:05 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
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