cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,091 Commits 10 Branches 0 Tags
dba0bf4304a627d970d895fb7205fbd7245c0f94
Commit Graph

96 Commits

Author SHA1 Message Date
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
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
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
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
Atermonera
cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04:00
Atermonera
ee32bfcf23 Merge pull request #6807 from Neerti/multiline_command_stuff 
QoL: Comms Consoles
 2020-03-11 02:10:40 -04:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Novacat
1c80ed2a88 Merge pull request #6622 from Shadow-Quill/Holowarrant 
Holowarrants can now only be authorized by an ID with HoS access
 2020-02-25 10:50:30 -05:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Atermonera
1010fd283b Merge pull request #6690 from VOREStation/vplk-ntnet-fixer 
Fixes to Modular Computers and NTNet Relays
 2020-02-21 01:58:20 -05:00
Shadow
b95c2261b2 Holowarrants 2020-02-20 16:04:51 -06:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Shadow
1e4fa13f67 TSS Changes+Update 2019-11-23 00:19:38 -06:00
TrilbySpaceClone
c1f2d35b13 Ill maintain this I sware! 2019-10-05 21:43:09 -04:00
Heroman
8872a08a1a Fixes bugs with suit sensors and tether levels 2019-08-17 09:24:57 +10:00
Heroman
a8e3b1e270 Replaces Terminated with Dismissed as default rank removal 2019-08-03 21:59:56 +10:00
Heroman
0bc5d5b3ba Replaces Termination with Demotions as default rank removal 2019-07-28 06:46:05 +10:00
Heroman3003
ca13a8872c MC camera and access fixes and adjustments (#6269) 
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
 2019-07-09 14:01:53 -04:00
Novacat
78fc028dba Merge pull request #5420 from VOREStation/upstream-merge-6256 
[MIRROR] Fixes '1' message from MCs
 2019-07-03 13:54:17 -04:00
Anewbe
f4feaf1363 Merge pull request #6256 from Heroman3003/fixtheone 
Fixes '1' message from MCs
 2019-07-03 13:11:12 -04:00
Anewbe
e08616f1ee Merge pull request #6260 from Heroman3003/alarmchange 
Properly splits security and engineering alarms
 2019-07-03 13:11:00 -04:00
Atermonera
58c2b2311e Merge pull request #6247 from mistyLuminescence/zruntime 
Fixes runtime and GPS problem with invalid Z-levels
 2019-07-01 20:46:10 -04:00
Novacat
9b291fa5b2 Merge pull request #5226 from VOREStation/upstream-merge-6160 
[MIRROR] Fixes access restrictions for com&com MC program
 2019-05-14 00:01:14 -04:00
Novacat
f39068dd19 Merge pull request #5225 from VOREStation/upstream-merge-6152 
[MIRROR] Restricts alarm monitor MC program access to engineering
 2019-05-14 00:01:06 -04:00
Novacat
09dedeb6c9 Update alarm_monitor.dm 2019-05-13 22:57:31 -04:00
Neerti
fb5a2f1904 Merge pull request #6160 from Heroman3003/commod-fix 
Fixes access restrictions for com&com MC program
 2019-05-13 22:57:12 -04:00
Novacat
ad5fa6c7e3 Update camera.dm 2019-05-13 22:57:06 -04:00
Novacat
d95b7fda42 Update camera.dm 2019-05-13 22:56:41 -04:00
Neerti
74aa8184bf Restricts alarm monitor MC program access to engineering 2019-05-13 22:55:57 -04:00
Neerti
31174cee2d Restricts camera access on MC 2019-05-13 22:55:47 -04:00
Anewbe
d1c953fb0e Merge pull request #6161 from Heroman3003/atmosaccessfix 
Fixes access restriction for MC atmos control
 2019-05-12 13:57:34 -04:00
Novacat
a8bfa80298 Merge pull request #5189 from Heroman3003/mc-camera-access 
Restricts access on camera program
 2019-05-05 20:31:34 -04:00
Heroman3003
c1263a31e8 Restricts access on camera program 2019-05-06 09:55:58 +10:00
Heroman3003
6c3b174b4a Restricts alarm program to engineering 2019-05-06 09:51:30 +10:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00