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
82,172 Commits 5 Branches 0 Tags
980ece6324df6d07e7a2fc365ded411374311bbf
Commit Graph

168 Commits

Author SHA1 Message Date
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
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21: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
85d7b3d8f1 Merge pull request #6657 from VOREStation/aro-customtabs 
Adds 3 additional tablet types
 2020-03-01 10:55:00 -05:00
Novacat
dd23477faa Merge pull request #6624 from VOREStation/aro-customtops 
Replace/add laptop sprites
 2020-03-01 10:51:45 -05:00
Aronai Sieyes
243e7353c5 Swap elite and hybrid laptop sprites 2020-02-29 12:07:11 -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
Atermonera
b353ec7d01 Fixes MCs not being rechargable 2020-02-24 16:25:34 -05:00
Aronai Sieyes
ca1d2d9c16 Improve hybrid laptop hardware 2020-02-23 13:34:00 -05:00
Aronai Sieyes
0338574f32 Adds 3 additional tablet types 
Rugged, elite, and hybrid, like the laptop PR
 2020-02-23 13:31:58 -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
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -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
Aronai Sieyes
afac4663fe Replace/add laptop sprites 
Ported from CEV-Eris
 2020-02-20 20:40:59 -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
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Atermonera
ac208d171d Preset (mapped-in) modular computers now have printers by default. (#6639) 2020-01-23 23:55:51 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Anewbe
cbe8493dbf November Map Tweaks 2019-11-29 19:47:49 -05:00
Shadow
1e4fa13f67 TSS Changes+Update 2019-11-23 00:19:38 -06:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Atermonera
ea876b37cf Merge pull request #6476 from Hawk-v3/master 
Printers print Fields correctly now.
 2019-10-08 04:22:16 -04:00
TrilbySpaceClone
c1f2d35b13 Ill maintain this I sware! 2019-10-05 21:43:09 -04:00
Hawk_v3
1a360ed49c Printers print Fields correctly now. 
You're all welcome!
 2019-10-05 19:57:41 +01:00
Atermonera
0b31dcace5 Properly sorts all protolathe designs 2019-09-26 03:00:43 -04:00
Heroman
8872a08a1a Fixes bugs with suit sensors and tether levels 2019-08-17 09:24:57 +10:00
Novacat
c2463fc02b Merge pull request #5528 from Heroman3003/demotion 
Replaces "Terminated" with "Dismissed" as default rank removal
 2019-08-03 08:41:50 -04: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
Andrew
e4deaa6478 Combat Mechs Can Punch More Things (#6303) 
* Combat Mechs Can Punch More Things

Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).

Gives punching objects a check so you don't accidently smash something without meaning to.

Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.

* Take_Damage Boogaloo

* More take_damage Stuff

Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.

More stuff can be broken by mech punch and simple mobs.

* Adds changelong

* usr to user
 2019-07-24 17:00:24 -04: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
Heroman
6c65828dd6 Fixes closing laptops with no proper support 2019-06-04 08:19:11 +10:00
Unknown
2071f9273e Allows Benches/Racks to support laptops 2019-05-27 12:15:51 -04:00
Unknown
34547c3282 Adds some differences for rugged laptops 2019-05-27 12:09:31 -04:00
Unknown
7515df6187 Another new sprite 2019-05-27 12:01:00 -04:00
Unknown
63fff025bb New Modular Computer Sprites 
- New laptop sprite, currently only used for the elite model
- New console sprite that matches pre-existing consoles

Also fixes a bug with Pathfinder spawning
 2019-05-27 11:22:33 -04:00
Neerti
3e1555c4f8 Merge pull request #6167 from Heroman3003/laptop-bugfixes 
Fixes some bugs with laptop
 2019-05-19 17:24:10 -04:00