Commit Graph

12348 Commits

Author SHA1 Message Date
DJSnapshot
1a50dddbd4 replaced electrodes with insta hit taser beams. 2014-04-05 17:13:09 -07: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
Ccomp5950
78968de207 Merge pull request #4674 from Jarcolr/diction
Fixes #4621
2014-04-01 13:39:11 -05: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
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
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
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
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
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
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
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
Chinsky
820b5e0d9b Merge pull request #4632 from Ccomp5950/apc_low_charge_fix
Bugfix for new APC code, gridchecks won't just turn off equipment.
2014-03-25 23:12:21 +03:00
Mloc
38a22e880f Merge pull request #4623 from Ccomp5950/bugfixes
Bugfixes, Various
2014-03-25 08:45:53 +00:00
Ccomp5950
d6a9448535 Bugfix for new APC code, gridchecks won't just turn off equipment.
Was a problem with me switching the order of the checks.
2014-03-24 17:42:27 -05:00
Mloc-Hibernia
d4324901d3 Revert "Merge pull request #4478 from Aryn/master"
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
2014-03-24 13:55:41 +00:00
Mloc-Hibernia
34c39e773a Revert "Merge pull request #4513 from Aryn/master"
This reverts commit fa88663c23, reversing
changes made to 608c48c6db.
2014-03-24 13:55:23 +00:00
Mloc-Hibernia
1233e5568f Revert "Merge pull request #4541 from comma/dev"
This reverts commit 596b6084e3, reversing
changes made to fa88663c23.
2014-03-24 13:54:50 +00:00
Mloc-Hibernia
dc97a2502a Revert "Merge pull request #4607 from Aryn/master"
This reverts commit a1fee3e6c3, reversing
changes made to bf4533efde.
2014-03-24 13:54:11 +00:00
Ccomp5950
e54ce881eb NVG Bugfix
Now they work, and also added a green hud element that tints the screen green when nvg's are worn.
2014-03-23 13:51:57 -05:00
Mloc
9d1ecdfbe8 Merge pull request #4618 from Ccomp5950/mob_controller_controlled
Code Effeciency project:  mob_controller / human and monkey Life()
2014-03-23 17:22:18 +00:00
Ccomp5950
0225d7b3b0 Bug fix 3: Now with a vengence. Monkey pockets cause scrolled chat.
Added the check to see what you clicked in the inventory when clicking on pockets and added a message for it.  Now it won't just be a line break.

Fixes #4601
2014-03-23 06:05:23 -05:00
Ccomp5950
d08bff84c9 Bugfix 2: Electric Boogaloo, Ninjas being tracked by AI's
Removed AI's ability to track them sneaky ninja's.
2014-03-23 05:43:18 -05:00
Ccomp5950
6fa08b233d Law office -> Internal Affairs in Area code.
fixes #4577
2014-03-23 04:44:06 -05:00
Ccomp5950
7000cce408 Admin Request: Logs now will end in CRLF on unix systems.
Also removed the "SERVER HAS CALLED FOR A VOTE" spam
2014-03-23 02:26:06 -05:00
Chinsky
6f8b599794 Merge pull request #4615 from Ccomp5950/nano_ui_admin_fix
VV drop down menu to resend NanoUI resource files.
2014-03-22 21:00:50 +03:00
Ccomp5950
28392e9414 Code effeciency project: handle_virus_something() (human and monkey /Life())
2 for loops is more expensive then what we're doing here.
Also we check to see if virus2 is populated before starting a for loop
2014-03-22 07:50:23 -05:00
Ccomp5950
8106b6a4ae Code Effeciency project: Damn monkies Life()
pretty much the same effeciencies from human/life()

no need to updatehealth() over and over and over
no need to process environment if everything is normal
etc.
2014-03-22 06:56:09 -05:00
Ccomp5950
ce83c5c64e Code effeciency project: handle_environment (human/life())
Before:  We process a whole lot of bullshit for no real reason most of the time because temperatures are perfect.

Now:	 We check if our temperatures and environment are within normal bounds and get the hell out of the proc.

Also:    Mobs that are long dead or just dead mobs spawned at round start won't process Life(), those 3 clowns don't need Life(), those jerks.
2014-03-22 06:22:01 -05:00
Ccomp5950
f1506acf1e Code effeciency project: Handle_Organs (human/life())
We do a bit of pre-processing to see if we want to do checks on all the organs.

First we don't even do preprocessing unless we have damage of some kind
afterwards we process what is hurt until it gets better or overall we get worse
when we go ahead and check everything else out again.

Can add a safety check in life every 30 ticks or so go ahead and check every organ again but I don't think it's needed.
2014-03-22 04:33:48 -05:00