cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,569 Commits 5 Branches 0 Tags
262d63f4ee97a475967af46f46ef83f6b378998d
Commit Graph

30705 Commits

Author SHA1 Message Date
Carl?
262d63f4ee Update trash_pile.dm 2018-04-15 13:32:40 -04:00
Carl?
676ec8a94c Update seed_storage_vr.dm 2018-04-15 13:28:51 -04:00
Carl?
67ec328617 Update seed_datums_vr.dm 2018-04-15 13:28:07 -04:00
Carl?
c108469229 Update seed_packets_vr.dm 2018-04-15 13:27:54 -04:00
Carl?
460a359f78 Re-'Balance' 
Removed sleeping and oxyloss as per request.
 2018-04-08 21:38:21 -04:00
Carl?
ba4728a7ea Proper Chems 
Actually makes this a proper thing, rather than what had been previously done.
 2018-04-08 09:16:23 -04:00
Kelshark
c048a8ea8b Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt
 2018-02-02 19:25:51 -05:00
Aronai Sieyes
1b1e6b54a2 Merge pull request #2931 from VOREStation/polaris-sync-2018-02-01 
Polaris Sync 2018-02-01
 2018-02-02 19:03:04 -05:00
Aronai Sieyes
92cf578e2e Merge pull request #2932 from Ketrai/patch-1 
Making mining drills faster. (fix)
 2018-02-02 18:59:17 -05:00
Aronai Sieyes
075eb59620 Merge pull request #2930 from Cyantime/shuttles 
Shuttle transit zone changes
 2018-02-02 18:56:01 -05:00
Aronai Sieyes
335c12af0a Merge pull request #2933 from LittleBigKid2000/nifsoft-changefixrefactor 
Small NIFSoft disks change, minor fix and refactor
 2018-02-02 18:52:53 -05:00
Arokha Sieyes
cf4455e8db Adds cap on PTO 
18 consecutive off-duty shifts is ... probably enough.
 2018-02-02 18:37:50 -05:00
Kelshark
c4198a74f2 Custom fluff Strix / Kita 2018-02-02 08:51:51 -05:00
Repede
7aac612c2c Merge pull request #79 from RadiantFlash7/master 
All my changes so far.
 2018-02-02 08:41:16 -05:00
RadiantFlash7
22d13f10c2 All my changes so far. 
note to self: Engineering, Perma, civil jobs, and electricity+piping
 2018-02-02 04:57:01 -05:00
Ketrai
7ed9e2ea36 Making mining drills faster. (fix) 
All drills but borgdrill, and diamond drill are now 10% faster, which is a significant boost.
Diamond drill is 20% faster
Borg drill is roughly ~ 15% faster
Felt like with the removal of the rigsuit, mining feels extremely slow and clunky again. Ripley has gotten buffed, which makes it an excellent contendor now, with it being slightly slower whilst restricting movement, but better at tunneling, and gathering up veins. As well as allowing the hauling of large amouns of crates, and stationary drills.

This change should make the normal drill feel smooth enough for the early stages, especially nice if there is no research, such as on skeleton shifts, yet you wanna do some mining for abandoned crates and such. It also makes upgrading the drills feel even nicer.

Before update:
Basic drill is 8x as slow as a diamond drill.
Advanced drill is 6x as slow as a diamond drill.
Even the best drill, aka jackhammer and plasma cutter, is 4x as slow as a diamond drill.
Borgs were around 3x as slow as a diamond drill; Meaning they start with far superior gear compared to a miner.

After update:
Basic drills are still 8x times as slow as a diamond drill, so that upgrade still feels just as powerful
Advanced drills are now 6.75x as slow as a diamond drill.
Jackhammer/plasma cutters are now 4.5x as slow as a diamond drill.
Borg drills are now 3.25x as slow as a diamond drill.
 2018-02-02 10:05:03 +01:00
Isaac Erwin
a92fb455d8 NIFSoft disks change, minor fix and refactor 2018-02-02 03:45:40 -05:00
Leshana
4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01 
# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png
 2018-02-01 23:55:47 -05:00
Cyantime
3dab4c7abf Move this to a different place 2018-02-01 21:32:23 -05:00
Cyantime
2ce992f404 Shuttle transit zone changes 2018-02-01 21:09:06 -05:00
Neerti
a493a379fe Merge pull request #4661 from VOREStation/vplk-ss-zas-airflow 
Convert ZAS into StonedMC Subsystems
 2018-02-01 21:08:41 -05:00
Anewbe
4b4e3bb6f1 Merge pull request #4672 from elgeonmb/patch-1 
humans can be older
 2018-02-01 15:21:36 -06:00
Neerti
504593a01e Merge pull request #4696 from Woodratt/01312018_guncabhotfix 
Gun Cabinet hotfix
 2018-02-01 02:51:02 -05:00
Woodratt
f68cf380ae Gun Cabinet hotfix 
- Should fix explorers not being able to get into their gun cabinets
 2018-01-31 23:13:30 -08:00
Neerti
24569fb95d Merge pull request #4690 from Woodratt/01312018_SC_Stationmapfixes 
Further Map Fixes and Adjustments
 2018-02-01 01:20:06 -05:00
Aronai Sieyes
f5511dc458 Merge pull request #2921 from VOREStation/aro-alienship2 
Tweak away mission
 2018-01-31 23:16:04 -05:00
Aronai Sieyes
547059aace Merge pull request #2922 from VOREStation/vplk-communicators-nope 
Prevent communicators from connecting to the exonet when off station.
 2018-01-31 23:04:14 -05:00
Leshana
a7c3511202 Make telecomms relays work even when shuttling places. 2018-01-31 22:16:34 -05:00
Aronai Sieyes
e552654f27 Merge pull request #2914 from LittleBigKid2000/workout-refactor 
Exercise equipment changes/refactor
 2018-01-31 21:02:57 -05:00
Leshana
612a75cb49 Prevent communicators from connecting to the exonet when off station. 2018-01-31 21:02:22 -05:00
Aronai Sieyes
763a71aae5 Merge pull request #2920 from LittleBigKid2000/capitalization-fixes 
Loadout capitalization fixes
 2018-01-31 21:02:11 -05:00
Arokha Sieyes
afb24d364f POLARIS: Fix two mistakes with the shuttle_arrival procs 2018-01-31 20:56:57 -05:00
Isaac Erwin
5d53e8009e Loadout capitalization fixes 
Because inconsistent capitalization triggers me
 2018-01-31 20:31:41 -05:00
Isaac Erwin
ec20277805 Removed unnecessary 'src's, added missed cooldown 2018-01-31 20:20:43 -05:00
Woodratt
0714585c38 Fix for Camera Networks 
- Proper Camera Networks should be on the Camera console now
- Miner name change for Tcomm Network
- Removal of the unneeded Network list
 2018-01-31 16:22:02 -08:00
Neerti
0cf61cf61d Merge pull request #4684 from SunnyDaise/OnionFix 
Quick Typo Fix
 2018-01-31 15:44:59 -05:00
Neerti
c18ce47bff Merge pull request #4683 from Woodratt/01302018_SC_POIMAP 
Southern Cross POI adjustment and Map adjustments
 2018-01-31 15:42:48 -05:00
Atermonera
44b8b6f5ce ID computer can now assign planetside jobs, command secretary, IAA (#4665) 
* ID computer can now assign planetside jobs

* Command Secretary and IAA on the menu

* Command secretary has keycard auth. access

* And normal access
 2018-01-31 14:13:12 -06:00
Aronai Sieyes
cc857cab00 Merge pull request #2917 from VOREStation/vplk-reghosts 
Make ghosts invisible again.
 2018-01-31 14:41:41 -05:00
Woodratt
ed29353021 Further Map Fixes and Adjustments 
- Deck 3 Port Airlock fixed
- Vent added to cargo delivery office to fix over pressure
- Windoor in Robotics given proper access and named
- Parachute crate added to pilot areas
- Access around cargo made more consistent
- Fixed first deck starboard hallway area
- Pilots now have access to maintenance around the hangars
- More ATMs added
- Center door on bridge removed
- Open sign from Bar borrowed for cafeteria as well
- Critical addition, Dog bed in HoP office
- Fixed T-comms turrets yet again
- Adjustments to engine room allowing for a second set of TEGs to properly be set up (Thanks to Kerbal/Mazian). Also moved vent control to a different position to stop a certain headmin from repeatedly hitting it
 2018-01-31 05:11:23 -08:00
Isaac Erwin
35c4a8030e Exercise equipment changes/refactor 2018-01-31 07:30:40 -05:00
Arokha Sieyes
17723b7df6 Cleans up references to assistant 
Defines the USELESS_JOB value as "Visitor"
 2018-01-31 00:55:13 -05:00
Leshana
f6f3abe5ec Make ghosts invisible again. 2018-01-30 23:36:57 -05:00
Leshana
2f459aa8c4 Fixed Occupation Pref bitflag overflow for INTERN 
* Intern was using bit 16 which evidently doesn't work because BYOND is drunk.
* Moved it to ENGSEC department flag.  These are used only for pref saving, nothing else, so oh well.
 2018-01-30 21:55:31 -05:00
Leshana
6eec4063f3 POLARIS: No string compare for assistants 2018-01-30 21:44:00 -05:00
Aronai Sieyes
89f4e00e16 Merge pull request #2902 from VOREStation/vplk-pto 
Quick bugfixes for assistant ->visitor/intern
 2018-01-30 21:25:19 -05:00
Arokha Sieyes
76a1006cfb VS: Fix bit for Pilot and lack of config at new 2018-01-30 21:16:42 -05:00
Arokha Sieyes
3031dd8afa POLARIS: No string compare for assistants 2018-01-30 21:16:41 -05:00
Leshana
16e8b12ae1 Fix annoying runtime at startup hook. 2018-01-30 20:06:01 -05:00
Aronai Sieyes
cdac98afc1 Merge pull request #2897 from VOREStation/aro-bstemple 
New Away Mission (and minor other stuff)
 2018-01-30 20:04:07 -05:00