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
16,679 Commits 10 Branches 0 Tags
6f55b6012023fe6e5dc22010942cb79ea3e4f17c
Commit Graph

12373 Commits

Author SHA1 Message Date
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
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
Ccomp5950
04aec7b885 Merge pull request #4651 from Jarcolr/patch-1 
Added more value to misc. supply crates
 2014-03-30 17:29:49 -05:00
Ccomp5950
da722fd8f6 Merge pull request #4648 from GinjaNinja32/master 
Add colour to AI private channel (144.7)
 2014-03-30 13:46:13 -05:00
RavingManiac
b8e27c1347 Missing files added. 2014-03-30 21:51:20 +08:00
RavingManiac
7c75e591cd Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed. 2014-03-30 21:41:13 +08:00
Ccomp5950
bf7684bced Lagsie no more, NarSie HUNGERS 
removed del() calls for objects, now it sets loc to null and removes it from master_controller processing

Much quicker :)
 2014-03-30 03:15:20 -05:00
Graham Lloyd
f176b2dea9 I can feel the hugs already. 2014-03-30 00:49:23 -04:00
Jarcolr
6568f4acfd Added more value to misc supply crates 
Your junk is even more junk-ish now!
 2014-03-30 00:13:56 +02:00
Ccomp5950
12b5db483e Oversight, miners can now bump mine boulders just like the rock around them. 
Screw you xenoarch code, screw you.
 2014-03-29 16:07:47 -05:00
Ccomp5950
02ba14ea8b Merge pull request #4645 from Jarcolr/patch-1 
Potato in processor doesn't instantly transform into fries anymore
 2014-03-29 15:04:51 -05:00
GinjaNinja32
5836931a17 Add colour to AI private channel (144.7) 
Changes the AI private channel colour to magenta (#ff00ff), and changes
the marker from [144.7] to [AI Private].

Magenta is far enough from the Science channel (#993399) to be obvious,
but I'm open to alternative suggestions.
 2014-03-29 18:22:36 +00:00
Ccomp5950
dc773f9e49 Merge pull request #4644 from Glloyd/3dsound 
3d Sound from /tg/
 2014-03-29 11:00:55 -05:00
Ccomp5950
2027892395 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-03-28 18:48:05 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
 2014-03-28 18:46:04 -05:00
Ccomp5950
b5dfa3f08d Merge pull request #4642 from Furlucis/master 
AI firelock using fix
 2014-03-28 14:42:51 -05:00
Jarcolr
e3bc3ff64c Removed text that came from nowhere..? 
uhh..
 2014-03-28 21:14:31 +02:00
Jarcolr
aae897f48f Potato in processor doesn't transform into fries anymore 
What it says on the tin. Fixes issue discussed in #4596.
 2014-03-28 20:55:10 +02:00
Graham Lloyd
b6f2d39f6b 3d Sound from /tg/ 2014-03-27 14:49:49 -04:00
Chinsky
581cc2bfea Merge pull request #4640 from Glloyd/holo2 
Fixes Holodeck exploits (Fixed)
 2014-03-27 15:13:02 +03:00
Chinsky
60b6daadee Merge pull request #4641 from Ccomp5950/log_fix 
*NIX Log files part 2.
 2014-03-27 15:12:19 +03:00
Chinsky
896ef5970b Merge pull request #4633 from MrLeebo/virology-fixes 
Virology - NanoUI, gameplay tweaks, bugfixes
 2014-03-27 15:10:35 +03:00
Furlucis
b83c99316c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-03-27 02:34:30 -04:00
Furlucis
ac923649eb Allows AIs to use hazardlocks 
I am absolutely certain that there is a better way to do this. Someone
else can do it, I'm just making it work.
 2014-03-27 02:16:38 -04:00
Ccomp5950
936db263ef *NIX Log files part 2. 
CR+LF added to new lines, created a global variable log_end that can be used
on newlines

log_misc("blahblah...[log_end]\nMoreblahblah[log_end]")

put [log_end] prior to any \n and it will show up correctly in windows.

Also created log_misc() proc to log to diary, and removed a bunch of

diary << stuff all over the place.
 2014-03-26 18:51:37 -05:00
Graham Lloyd
eb7baa787c Holorack 2014-03-26 19:14:39 -04:00
Ccomp5950
bee3d30baa Oops, broke Mesons when I fixed NVG's 
This should put things back where they go.
 2014-03-26 17:19:51 -05:00
Jeremy Liberman
bf6c3d3a24 Code review and remove baystation12.int from source control. 2014-03-25 22:17:02 -05:00
Chinsky
d6bb03943b Merge pull request #4626 from Iamgoofball/chambox 
Expanded on an old TG PR, Adds 9 new Chameleon items.
 2014-03-26 02:12:59 +03:00
iamgoofball
98264dc27e stop being a chemical container plzty 2014-03-25 16:11:40 -07:00