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
63,087 Commits 8 Branches 0 Tags
d21a54ad80337781f121e4dd2edd251a029d7a16
Commit Graph

112 Commits

Author SHA1 Message Date
Nadyr
d9e125f39c Update game.dm 2021-02-28 07:09:38 -05:00
Chompstation Bot
29ebaa8320 Fixes modular computer game sound volume 2021-02-19 13:32:36 +00:00
Darlantan
5a588c5d99 News Update 2021-01-31 03:12:19 -05:00
Razgriz
6e01953d53 Reduce Cuban Pete volume 
Pretty loud for a little tablet game
 2020-12-13 22:38:24 -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
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Atermonera
5fb16b70d6 Merge pull request #7686 from ShadowLarkens/mcomputer_overlay 
Allow separate overlays file for modular computers
 2020-09-26 16:31:20 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
ShadowLarkens
dd4f9c9967 TGUI NTOS - Total Conversion 2020-09-05 17:02:58 -07:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
ShadowLarkens
48b630891e TGUI Overmap Shuttle Controls 2020-08-18 20:42:12 -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
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +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
ShadowLarkens
dc6c47841d TGUI Backend Tweaks & Fixes 2020-08-07 00:29:50 -07:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02: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
ShadowLarkens
62b9315b5a TGUI Camera Console Part 3: Modular computers support 2020-07-16 16:19:49 -07:00
ShadowLarkens
a20eef5bfb TGUI Camera Console - Part 1; Plain console done 
# Conflicts:
#	code/_onclick/hud/skybox.dm
#	code/controllers/subsystems/skybox.dm
#	code/game/machinery/computer/camera.dm
#	tgui/packages/tgui/public/tgui.bundle.js
 2020-07-16 16:17:36 -07:00
ShadowLarkens
1cded01770 TGUI v3.0 
This ports TGUI, and makes the old nano crew monitor and the disposal
bins use it as first examples.
 2020-07-16 14:59:45 -07:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Atermonera
a697e83ebd Merge pull request #7326 from Neerti/arrival_announcement_fix 
Arrivals Shuttle Message Fix
 2020-07-09 18:29:38 -04:00
Darlantan
5e776cdc0b Adds Starcaster 
-Adds the starcaster, a device for reading the news.
-Adds starcaster as a free loadout item
-Comments out sleepy sergal articles, adds starfire articles
 2020-06-08 07:28:15 -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
4ff57116b4 Merge pull request #7793 from VOREStation/upstream-merge-7125 
[MIRROR] Ports Vore Telecomms Sprites
 2020-05-11 22:39:20 -04:00
Aronai Sieyes
4f89fc535f Fix cheeky icon port 2020-05-11 22:08:14 -04:00
Aronai Sieyes
96da7be01b Put APCs and SMESes into GLOB lists to ease iteration 2020-05-11 22:05:41 -04:00
Atermonera
29ed593881 Ports Vore Telecomms Sprites 2020-05-11 20:02:11 -04: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
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes
6cd52ff500 Merge pull request #7498 from VOREStation/aro-uav 
Adds UAVs
 2020-04-29 14:13:29 -04:00
Aronai Sieyes
3daef7673f Merge pull request #7494 from VOREStation/upstream-merge-6990 
[MIRROR] Refactor telecomms and consoles to operate on logical zlevels
 2020-04-29 11:40:20 -04:00
Aronai Sieyes
c2ca984d18 Merge VS changes for telecomms 2020-04-29 10:24:37 -04:00
Aronai Sieyes
e8c068912c Fix MC nav icon 2020-04-28 23:18:48 -04:00
Aronai Sieyes
0c2f8cedb5 Add UAV, UAV software 
Design placed in mechfab
 2020-04-28 23:18:08 -04:00
Atermonera
bdf186d16b Merge pull request #7024 from atlantiscze/2020_04_21_ValveProgram 
Converts Shutoff valve monitoring into a MC program
 2020-04-28 17:57:51 -04:00
Atermonera
eb6eb7bcd6 Refactor telecomms and consoles to operate on logical zlevels 2020-04-28 17:56:35 -04:00
Leshana
763753648b Implements "static" area machinery power usage 
- Instead of using auto_use_power to re-tally up machinery's power usage every cycle, track the steady "static" load separately from the transient "oneoff" usage.  Machines then only need to inform the area when they use oneoff power or *change* their steady usage.
- Remove auto_use_power and stop SSmachines from calling it.
- Add vars to track "static" usage for each of the three power channels to /area
- Rename the existing three vars to "oneoff" so its clear what they mean (and to catch people accidentally updating them directly)
- Update area power procs and APCs to use the new variables.
- Rename /area/proc/use_power() to use_power_oneoff() to make it clear what it is doing.
- Deprecate /obj/machinery/use_power() in favor of use_power_oneoff() but don't delete yet.  Can transition gradually.
- Add logic to the update_power procs on machines to calculate the deltas and update static area power whenever their usage changes.
- Add logic to machines to update area power when they are created, destroyed, or move.
- Moved /obj/machinery procs related to area power usage into machinery_power.dm to make them easier to find.
- Added or updated comments in several places to explain what is going on and how to use it.
 2020-04-23 19:04:34 -04:00
Atermonera
1e4f5aa80e Merge pull request #7009 from atlantiscze/2020_04_17_EPRFix 
Fixes supermatter monitoring EPR indicator showing Undefined
 2020-04-22 15:48:21 -04:00
Aronai Sieyes
008290e409 Port /tg/ telecomms sprites 
Probably originally from Eris? Not sure.
 2020-04-18 15:14:22 -04:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Aronai Sieyes
86177808ce Show all alarms on modular alarm monitor and mark major ones 2020-04-14 22:09:03 -04:00
Aronai Sieyes
4e0a62996b Add nav console modular program and fix crew mon bug 2020-04-12 22:52:57 -04:00
Aronai Sieyes
98dd3707c1 Refactor consoles to operate on logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Aronai Sieyes
e2d2964546 Refactor telecomms to send messages to logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Aronai Sieyes
05f1aa7356 Convert some telecomms constants into defines 2020-04-11 12:03:10 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Atermonera
8986eb7720 Merge pull request #6902 from VOREStation/vplk-ssalarm 
Convert alarm_manager into SSalarm subsystem.
 2020-03-30 20:41:10 -04:00