Commit Graph

7082 Commits

Author SHA1 Message Date
SparklySheep
c355a30cf6 Removes E-bow Instant Stun. Slight tox buff.
The E-bow with the stun is currently the most powerful weapon in the game. Stuns on hit, causes immediate damage, unlimited ammo with recharge, and the stun is not affected by armor. You can viably stunlock someone to death just by occasionally shooting them without running out of ammo. Horrible design and it warrants an immediate removal until I finish my E-bow changes later.
2014-04-10 14:41:37 -05:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction
Fixes some typos and descriptions
2014-04-09 21:48:19 +04:00
Jarcolr
868dea5681 Grammar patch 1
This is just the first one of many.
2014-04-08 14:48:31 +03:00
RavingManiac
f0bda5a494 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-04-06 14:28:28 +08:00
RavingManiac
e348f532ab Items inside objects will now hear what the object is hearing, as will items inside those items. This allows tape recorders to work in containers and closets. 2014-04-06 14:20:57 +08:00
DJSnapshot
772edffad1 Merge pull request #4700 from Jarcolr/diction
Spaghetti isn't called spagetti anymore
2014-04-05 17:05:06 -07:00
Jarcolr
bec699bb7c Spaghetti isn't called spagetti anymore
Didn't change the code/vars/recipes; just fixed the Name line to the
proper spelling.
2014-04-05 18:13:19 +03: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
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
ffd4afa43d Also fixes paperbin without hands
Whee.
2014-03-31 18:48:57 +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
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
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
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
Chinsky
60b6daadee Merge pull request #4641 from Ccomp5950/log_fix
*NIX Log files part 2.
2014-03-27 15:12:19 +03: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
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
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
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
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
Ccomp5950
62db2723dd Merge pull request #4614 from LightningIron/master
Added Alden-Saraspova counters to excavation closets.
2014-03-22 02:07:58 -05:00
LightningIron
37a4b9e7da Added Alden-Saraspova counters to excavation closets; item previously unobtainable. 2014-03-21 15:24:19 -05:00
Ccomp5950
731f08eb10 Rejuvination verb fix for IPC's limbs don't suddenly become organic. 2014-03-20 20:31:33 -05:00
Ccomp5950
5dbc141b9b IPC examination won't cause "OH NO ROBOTIC LIMBS" (no shit, yo!) messages.
Unless they are damaged.
2014-03-20 20:15:02 -05:00
Jim "Apples"
ae2c398b26 Merge pull request #4611 from Aryn/to-master
Ctrl-H "faggot" to "meatball" and one icon state change.
2014-03-20 11:22:37 +00:00
Aryn
de86280434 Ctrl-H "faggot" to "meatball" and one icon state change. 2014-03-20 05:05:23 -06:00
Aryn
01ba7b4dad Fixed issues with cyborgs deactivating flashlights, cleaned up some module code in the process. 2014-03-19 21:02:23 -06:00
Aryn
1b8dc12a7c I think I fixed everything it is possible to stuff a light source into. 2014-03-19 01:02:27 -06:00
Aryn
9007aedf15 Fixed an annoying bug with giving another player a flashlight,
opened up at least 100 individual bugs where people kept setting
loc and expecting light updates to catch it.
2014-03-18 22:12:23 -06:00
Aryn
7e08bca4ef One runtime fixed, other one didn't turn up.
I put in some stuff for it to be easier to find if it does.
2014-03-18 22:12:22 -06:00
Ccomp5950
98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm
2014-03-18 19:44:19 -05:00
Ccomp5950
b05f4df282 Merge pull request #4602 from RKF45/mining
Removal of plasma glass
2014-03-18 14:37:16 -05:00
Jarcolr
6300e859a2 Fixes #4600
Will fix #4600 and the problem with drinks not knowing when they are open/closed.
Hopefully I didn't miss a string of code again,I don't think so,though.
2014-03-17 23:13:29 +02:00
RKF45
ddb414d740 Removal of plasma glass 2014-03-17 20:37:10 +01:00
Mloc
83d028e394 Merge pull request #4588 from Ccomp5950/ore_process_optimize
Code effeciency project:  Ore processing.
2014-03-17 19:14:20 +00:00
Jeremy Liberman
31c79acd6e Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays 2014-03-16 21:16:31 -05:00
Mloc
38c84de28b Merge pull request #4585 from Ccomp5950/hud-no-client
HUD-Optimization bugfix, mobs with no clients will update their health
2014-03-16 11:49:04 +00:00