cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,724 Commits 6 Branches 0 Tags
10e76d9762e4f26a690be916d36da42da64b85f9
Commit Graph

12405 Commits

Author SHA1 Message Date
igalan
10e76d9762 E-Wallet object added. 
Made ATM to spawn e-wallets.

Untested.
 2014-04-15 05:27:23 +01:00
Chinsky
106697a677 Merge pull request #4755 from Jarcolr/devupdate 
New IPC Faces - SparklySheep
 2014-04-14 16:14:45 +04:00
Jarcolr
2ab200681b New IPC Faces - SparklySheep 
http://baystation12.net/forums/viewtopic.php?f=44&t=9840
 2014-04-14 11:30:29 +03:00
PsiOmega
34b0564d26 Adds a necessary check to ensure that pipes on top of plating can be painted. 2014-04-13 11:43:17 +02:00
PsiOmega
93012b3fca Ensures that one can only paint pipes within range and that there is no blocking floor tile. 2014-04-13 11:31:04 +02:00
DJSnapshot
756d7a83e9 Merge pull request #4715 from Iamgoofball/FUCKMONKEY 
Removes the last traces of Monkey Emergency
 2014-04-11 11:47:37 -07:00
DJSnapshot
da3489196c Merge pull request #4727 from Ccomp5950/FUCK-say-code 
Saycode rewrite.
 2014-04-10 22:42:38 -07:00
Ccomp5950
6056b5dc3d Some fixes saycode cleanups 
Moved the verb check from hear to the speaker

Spellcheck on hulk so Dragor doesn't beat me up.
 2014-04-10 00:05:52 -05:00
Iamgoofball
7b1f8a9994 changes attack hand to return 2014-04-09 14:07:16 -07:00
Ccomp5950
5698c135bc Merge pull request #4729 from Ravensdale/genetics 
Disable Genetics
 2014-04-09 13:32:58 -05:00
Ravensdale
d28cf40f5d Disabling of Genetics 2014-04-09 01:28:38 -07:00
Ccomp5950
46704a436b Saycode rewrite: Add support for speech_problem_flag 
Ready for Dev
 2014-04-08 21:50:01 -05:00
SparklySheep
341f8570e4 Changeling Rebalances 
As discussed here: http://www.baystation12.net/forums/viewtopic.php?f=5&t=10001
 2014-04-07 14:34:27 -05:00
Ccomp5950
e1fef1796e Merge pull request #4707 from DJSnapshot/tasers 
replaced electrodes with insta hit taser beams
 2014-04-07 02:16:01 -05:00
Ccomp5950
80bae7a87d Merge pull request #4705 from DJSnapshot/jumpsuits 
Undershirts and rolling down jumpsuits!
 2014-04-07 02:12:59 -05:00
Ccomp5950
9fb43f2333 Merge pull request #4706 from DJSnapshot/papers 
Carbonless copy papers
 2014-04-07 02:12:10 -05:00
DJSnapshot
86d273e25e DEBUG TEXT, WOO 2014-04-06 18:31:33 -07:00
DJSnapshot
36b2efd3df disregard failure. I made a silly. 2014-04-06 18:29:50 -07:00
iamgoofball
238451dbc9 die monkey emergency DIE 2014-04-06 12:05:41 -07:00
Ccomp5950
9d291b79ea Merge pull request #4695 from mwerezak/dev 
Made single cable pieces have w_class = 1
 2014-04-06 00:16:06 -05:00
DJSnapshot
1a50dddbd4 replaced electrodes with insta hit taser beams. 2014-04-05 17:13:09 -07:00
DJSnapshot
61036e529e Merge pull request #4692 from Hubblenaut/master 
Renamed paperwork no longer has 'paper -' in name
 2014-04-05 17:03:48 -07:00
DJSnapshot
4ea07e2617 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into papers 2014-04-05 16:24:56 -07:00
DJSnapshot
7b7f3bcfc0 Undershirts and rolling down jumpsuits! 2014-04-05 16:18:11 -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
Mike
fa1fd3cb24 Made single cable pieces have w_class = 1 
Single cable pieces have w_class = 1 and can be tucked behind the ear.
 2014-04-05 01:21:30 -04:00
Hubblenaut
0b29f83444 Renamed paperwork no longer has 'paper -' in name 2014-04-04 22:18:08 +02: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
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -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
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
Graham Lloyd
b0fc611aca Lets people put penlights into their ears. 2014-04-01 16:36:58 -04:00
Ccomp5950
78968de207 Merge pull request #4674 from Jarcolr/diction 
Fixes #4621
 2014-04-01 13:39:11 -05:00
PsiOmega
af32a714ce Engineering EVA now its own area. 
Fixes #4671.
 2014-04-01 18:01:15 +02:00
Jarcolr
b33e9d0b92 Fixes #4621 
Shogun forgotten in time.
 2014-04-01 17:36:36 +03: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
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
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
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
8cb97330a7 Merge pull request #4657 from Baystation12/dev-freeze 
0.1.10 Staging [Standby]
 2014-03-30 16:57:01 -07:00