Commit Graph

11266 Commits

Author SHA1 Message Date
Zuhayr
19c963ac73 Revised commit due to Mloc's suggestion. 2013-12-31 04:24:53 +10:30
Zuhayr
ba018c84af Typo. 2013-12-28 23:07:29 +10:30
Zuhayr
9f98909ce8 Nuke starting condition rebalance, op number scaling rebalance. 2013-12-28 23:00:42 +10:30
Zuhayr
6f186d6bac Possible fix for href exploit in uplinks, unable to test locally. 2013-12-27 18:12:46 +10:30
Zuhayr
20b6e6fecf Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-12-27 17:48:41 +10:30
Chinsky
2de31e29be Merge pull request #4128 from SkyMarshal/patch-5
Hypothetically adds proximity check to droppers.
2013-12-26 22:10:22 -08:00
Chinsky
92f169a72c Merge pull request #4124 from DJSnapshot/hotfix
Nerf to shield blobs
2013-12-26 22:09:06 -08:00
SkyMarshal
30970b7b56 Hypothetically adds proximity check to droppers.
This code is awful, but it appears "flag" (who names this shit?) acts as a proximity check.
2013-12-26 21:22:00 -07:00
DJSnapshot
efdeea5bab Nerf to shield blobs.
Now they take 2 hits instead of 3, that way they are a little easier to deal with and hopefully not as much meta will have to occur.
2013-12-26 13:20:38 -08:00
Zuhayr
4746a3ada9 Merge pull request #4120 from Miniature/master
Added leaving prints on APCs when using item on them
2013-12-25 03:52:04 -08:00
Miniature
3d6f8ee4b2 Added leaving prints on APCs when using item on them
(fix issue #4109)
2013-12-25 22:11:13 +10:30
Chinsky
0c94d2892d Fixes #4071
Emote needed "me" action first, using custom_emote instead.
2013-12-25 14:44:50 +04:00
Chinsky
5071ea57ad Fix for #3583
Hostile mobs now check adjacency before applying damage.
2013-12-25 14:20:56 +04:00
Chinsky
022fdf1e19 Merge branch 'master' of https://github.com/comma/Baystation12 2013-12-25 02:47:26 +04:00
Chinsky
e3e569593d Fixed dried blood showin up as 'dried the blood' 2013-12-24 18:47:06 +03:00
Chinsky
4cb94fbf50 Small pefomance boost for drying blood.
Now using colors instead of icon procs.
2013-12-24 09:33:00 +03:00
Ccomp5950
8e518cb4a9 Vending Machine PIN fix.
Removed requirement for PIN on vending machines with an easy way of adding it back in the future
or setting machines to not use it or use it depending on what we decide later on.

Someone attempted to make it where it would accept any PIN and this is just as annoying as typing in a PIN.

So...space communism, swipe your card and it spits out an item.  No PIN prompt at all.
2013-12-22 16:40:11 -06:00
Ccomp5950
fb78caf9a5 Fixes Power Grid checks killing the AI's SMES.
Added the turrent protected check to restore_power() that is already in power_failure()
2013-12-22 08:38:26 -06:00
Chinsky
a498de8356 Fixes #4075
Cannot turn around while unconscious or dead now.
2013-12-22 08:49:42 +04:00
alex-gh
a48100da74 Reattaching a mindless head no longer results in a runtime error 2013-12-21 22:50:13 +01:00
Zuhayr
b6fed55fcd Merge pull request #4086 from Ravensdale/player_age
Player age restriction tweak
2013-12-21 08:06:26 -08:00
Ravensdale
9d9c797135 changes pushed to master branch instead of dev 2013-12-21 07:31:43 -08:00
RavingManiac
b26492e66d Simplified the monkey pulling check as per Giacom's suggestion. 2013-12-21 13:51:06 +08:00
Zuhayr
dfeb32ce79 Merge pull request #4070 from RavingManiac/master
Crouching monkey, hidden mousetrap
2013-12-20 03:43:34 -08:00
RavingManiac
6f067f4b4f Removed two variables accidentally copied over from dev 2013-12-19 20:39:10 +08:00
Zuhayr
5b1bc6f8da Tentative fix for #4037, unable to reproduce runtime to check. 2013-12-19 22:13:48 +10:30
Zuhayr
c4b847e9c6 Amendment to chemistry beaker range fix. 2013-12-18 23:54:11 +10:30
RavingManiac
e92bb6a02b Two config variables added - disable_player_mice and uneducated_mice. The first, if enabled, prevents players from spawning as mice, and the second, if enabled, prevents mice from understanding human speech (which they now do my default)
universal_understand = 1 now allows player-controlled mobs to understand what everybody is saying without necessarily allowing them to talk back intelligibly. Mice have universal_understand = 1 by default.
2013-12-18 16:56:49 +08:00
Zuhayr
b4e11a6ff9 Possible fix for #3712 2013-12-18 11:51:20 +10:30
Zuhayr
924a7af50a Fixes #4034 2013-12-18 11:17:17 +10:30
Zuhayr
6984ba3fec Fixes #4040 2013-12-18 11:10:00 +10:30
Zuhayr
e110b51337 Allows gibs to be scanned for DNA. 2013-12-18 11:09:13 +10:30
Zuhayr
8d76690f44 Fixes #4042 2013-12-18 10:30:59 +10:30
RavingManiac
751219dbfd Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.
Triggered mousetraps and dead mice will be moved back to the top layer.

Monkeys will no longer move randomly while being pulled.
2013-12-18 02:08:38 +08:00
Zuhayr
0695774d24 Fixes #4050 2013-12-18 01:04:52 +10:30
Zuhayr
9f9b5285d8 Fixes #4058 2013-12-18 00:24:21 +10:30
DJSnapshot
bf1216ea3d Merge pull request #4041 from Ccomp5950/syndicate_id_runtime_fix
Runtime fixes with nuclear mode.
2013-12-07 17:47:25 -08:00
Mloc
0208cef65b EMERGENCY HREF exploit fix.
Impressive chaos, but its time is over.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-12-07 21:26:37 +00:00
Chinsky
6c7391fd21 Merge pull request #4039 from Ccomp5950/teleport_bug_squish
Teleport bug fix...maybe.
2013-12-07 10:50:26 -08:00
Ccomp5950
570c98f0e2 Runtime fix: N00k agents on spawn were causing a runtime here. 2013-12-07 05:18:27 -06:00
Ccomp5950
fea1819260 Runtime fix: It was a bad idea to have this stuff in New()
So now it gives a default values and moves on.
2013-12-07 05:17:04 -06:00
Ccomp5950
4cb9cd0911 Teleport bug fix
Since we're unable to reproduce this bug in a testing environment and I've already concluded this isn't a telescience bug then I am leaning more towards Xenoarchiology, specifically the artifacts.

This sanity check basically makes it where if there is an artifact on null terf or inside a container it won't process the effect.
If it's the teleport effect of artifacts that is causing this to happen and it's based on the item being in nullspace somehow then it should squash the bug.
Though the root of this is probably #4037 I cannot reproduce the runtime either.

So here goes, a stab in the dark.
2013-12-07 00:18:40 -06:00
Chinsky
828bd55c09 Merge pull request #4036 from Ccomp5950/telesci_fix
Telescience bugfixes
2013-12-06 16:56:46 -08:00
Ccomp5950
f7d0d95775 Removed useless sanity check.
I debugged telesci with a proc that fires the teleport but bypasses all sanity checks and sets target = locate(0,0,0) or null
neither case caused the teleport bugs we are seeing
2013-12-06 06:03:21 -06:00
Ccomp5950
9a6b4c6a0d Telescience bugfixes
UI will now update when clicking on stuffs

Added a sanity check to make sure the teleport location isn't 0 or null on all 3 coordinates.
Not sure if this will plug up the random teleporting bug but it can't hurt to have this in there.
2013-12-06 04:48:02 -06:00
Ccomp5950
0850c30d37 Become Mouse now has a confirmation window.
Squeek!  Now people can quit complaining about hitting it by accident.
2013-12-05 20:29:38 -06:00
Zuhayr
17380e308e Extra check in secure case interaction for aliens. 2013-12-05 22:04:11 +10:30
Zuhayr
ced5cf2020 Actually fixes #4030, previous commit fixes #4014 2013-12-05 21:59:12 +10:30
Zuhayr
a110cfaed7 Fixes #4030 2013-12-05 21:58:33 +10:30
Zuhayr
78f6c478e7 Merge pull request #4031 from Ccomp5950/investigate_fix
Added Telesci to the investigate list.
2013-12-05 03:00:33 -08:00