cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,686 Commits 10 Branches 0 Tags
4ea07e26177454596eaeb8ffa09aba501579cec8
Commit Graph
16686 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DJSnapshot 4ea07e2617 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into papers 2014-04-05 16:24:56 -07:00
Mloc cd23a4b786 Merge pull request #4690 from Glloyd/ear_stuff_2 
A first pass at more realistic w_class values
 2014-04-05 16:23:59 +01:00
Ccomp5950 6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2014-04-04 01:14:31 -05:00
Ccomp5950 766fc36902 Merge pull request #4684 from mwerezak/master 
Code cleanup regarding APCs
 2014-04-04 01:12:23 -05:00
Graham Lloyd 16f92b0185 Merge branch 'dev' of https://github.com/Glloyd/Baystation12 into dev 2014-04-03 17:55:14 -04:00
Graham Lloyd 72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Graham Lloyd e5ecacf629 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-04-03 16:57:44 -04:00
Ccomp5950 13532e1ddd Merge pull request #4655 from RavingManiac/dev 
Inflatable walls and airlocks
 2014-04-03 13:31:39 -05:00
Ccomp5950 5f1c9317b2 Merge pull request #4679 from Glloyd/ear_stuff_1 
Lets people put penlights into their ears.
 2014-04-03 13:31:25 -05:00
Graham Lloyd 8071c30555 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-04-03 13:33:41 -04:00
RavingManiac 412467aa1e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-04-03 22:19:59 +08:00
Ccomp5950 a28243b054 Merge pull request #4676 from PsiOmegaDelta/MapFixes 
Map fixes - Tactical, central primary, medbay, telescience, and engine
 2014-04-02 23:41:16 -05:00
Mike efba89daff Corrected comments for CELLRATE and CHARGELEVEL 
Comments erroneously stated that a value of 0.002 would convert 1000
watts to 20 charge per tick, when in reality 1000*0.002 = 2 not 20.
Similarly for CHARGELEVEL.
 2014-04-02 23:48:48 -04:00
Mike 353941db7c APCs that are undersupplied now call cell.give() 
APCs that are undersupplied now call cell.give() instead of manipulating
cell.charge directly, for better encapsulation.
 2014-04-02 23:46:54 -04:00
PsiOmega 26b3179238 Removes an unnecessary door in medbay maintenance that could potentially cause people to get stuck (for example two engineers coming from either end, pulling pumps after them, making backtracking difficult). 2014-04-02 11:22:26 +02:00
Graham Lloyd b0fc611aca Lets people put penlights into their ears. 2014-04-01 16:36:58 -04:00
PsiOmega ee8dabf5d8 Forgot to also update the the area turf. I am the worst. 2014-04-01 21:33:29 +02:00
PsiOmega 33e0a2ccff Engine room now has a vent and scrubber connected with the main pipe networks. 
Fixes #4670
Made an attempt to restore the half of telescience that was reverted at some point.
Related to #4664
 2014-04-01 21:07:56 +02:00
Ccomp5950 78968de207 Merge pull request #4674 from Jarcolr/diction 
Fixes #4621
 2014-04-01 13:39:11 -05:00
PsiOmega 346fd81dd1 Reconnects Telescience APC to the main power grid. 
Renames it from Misc. Research to Telescience.
Fixes  #4664.
 2014-04-01 19:18:31 +02:00
PsiOmega 2ecf500d75 Done... but my commits be ugly now. 2014-04-01 18:44:57 +02:00
PsiOmega 2b6972b131 Reduces the number of pipes under reinforced walls around central primary hallway. 
Attempted to ensure that each section (divided by emergency shutters) either has a single air alarm & vent & scrubber or none, to avoid issues with areas being filled/emptied indefinitely.
 2014-04-01 18:37:20 +02:00
PsiOmega d1c4191665 New prepare base. 2014-04-01 18:13:25 +02:00
PsiOmega 6be64a2456 Adds a missing section of distribution pipes behind the medbay bathrooms. 
Fixes #4672
 2014-04-01 18:13:00 +02:00
PsiOmega 43aadfa897 New prepare base. 2014-04-01 18:07:31 +02:00
PsiOmega a300b7cc80 Removes duplicate pipe in engineering. 
Fixes #4667
 2014-04-01 18:06:24 +02:00
PsiOmega 9cc99c54ee New prepare base. 2014-04-01 18:02:01 +02:00
PsiOmega af32a714ce Engineering EVA now its own area. 
Fixes #4671.
 2014-04-01 18:01:15 +02:00
PsiOmega 1d20f697f8 Base prepare. 2014-04-01 16:48:29 +02:00
Jarcolr b33e9d0b92 Fixes #4621 
Shogun forgotten in time.
 2014-04-01 17:36:36 +03:00
Chinsky c35057a2b7 Merge pull request #4661 from Glloyd/malf_fix 
Fixes malfunction picking players to be malf who don't have BE_MALF toggled on.
 2014-04-01 18:26:04 +04:00
Chinsky 0bf6708342 Merge pull request #4666 from Ccomp5950/apc_fix 
APC bugfix after someone messed with mah areas!
 2014-04-01 18:17:22 +04:00
PsiOmega d025e4d2e3 The Tactic Equipment room is now its own area with APC, air alarm, and camera. 
Changed light source from bulb to light tube.
 2014-04-01 15:46:37 +02:00
Chinsky 26007716e4 Merge pull request #4660 from Jarcolr/patch-2 
Can no longer use fire extinguisher closet without hands
 2014-04-01 16:23:18 +04:00
Chinsky 7d2dd1d4b4 Merge pull request #4663 from MrLeebo/dev 
Update README with how to ignore baystation12.int
 2014-04-01 15:20:06 +04:00
Ccomp5950 6af132b834 APC bugfix after someone messed with mah areas! 
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.

We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.
 2014-04-01 03:06:58 -05:00
Jeremy Liberman 85ede45151 Add note in README about ignoring baystation12.int 2014-03-31 20:03:46 -05:00
Graham Lloyd eae613d928 Fixes malf picking players to me malf who don't have BE_MALF toggled on. 2014-03-31 15:39:49 -04:00
Jarcolr 231ecb6890 Cannot wash your missing hands anymore 
M as mob changed to user as mob; don't know why it was shortened to 1 letter,but eh.
 2014-03-31 21:13:26 +03:00
Jarcolr ffd4afa43d Also fixes paperbin without hands 
Whee.
 2014-03-31 18:48:57 +03:00
Jarcolr cf42e348f0 Can no longer use fire extinguisher closet without hands 
If you did not have hands,you could click on a emergency closet and have it spawn in your hand,and it would stay there,floating.
Cool,right?
 2014-03-31 18:19:25 +03:00
Chinsky ccf10f56db Merge pull request #4656 from Jarcolr/master 
Fixes #4536
 2014-03-31 15:01:55 +04:00
Chinsky c0484a5b29 Merge pull request #4658 from DJSnapshot/hotfix 
Map fixes
 2014-03-31 15:01:38 +04:00
Chinsky aa4471f096 Merge pull request #4653 from Glloyd/hugs-for-the-hug-god 
Hugging!
 2014-03-31 14:58:49 +04:00
Chinsky 9227823e2c Merge pull request #4654 from Ccomp5950/Buff_NarSie 
Lagsie no more, NarSie HUNGERS
 2014-03-31 14:57:43 +04:00
DJSnapshot 19db97f9e2 Merge pull request #4650 from Ccomp5950/damn_boulders 
Oversight, miners can now bump mine boulders just like the rock around them
 2014-03-31 00:27:04 -07:00
DJSnapshot 48b431332f Merge pull request #4646 from Ccomp5950/master 
Changelog update, added notes for previous merges.
 2014-03-31 00:25:54 -07:00
Ccomp5950 5e045674d1 Changelog update for previous merges 2014-03-31 01:50:58 -05:00
DJSnapshot ddbe9dcc37 fix for robotics access to the morgue. 2014-03-30 23:29:58 -07:00
DJSnapshot 0183e53069 Fix for surgery doors. 
Fix for bad piping in medbay maintenance.
 2014-03-30 21:35:56 -07:00