Commit Graph

6331 Commits

Author SHA1 Message Date
Chinsky
5f9045eb06 Merge pull request #4169 from Kilakk/master
Fixed centcomm status reports listing vox raiders
2014-01-01 14:42:38 -08:00
Mloc
9e4a5b09a3 Merge pull request #4160 from Ccomp5950/albino_clone_fix
Albino clone fix
2014-01-01 11:02:55 -08:00
Kilakk
3f4646ed58 Fixed centcomm status reports listing vox raiders
* It would say something like "Kikichata, the MODE"
* Which is hilarious, but still
2014-01-01 13:28:52 -05:00
Ccomp5950
c6c09954aa Cleanbot runtime derp.
Set something to null then change a variable on it?  Sure that won't runtime.
2014-01-01 02:55:08 -06:00
Chinsky
2cf4a9279c Merge pull request #4157 from Ccomp5950/cleanbot_fix
Bugfix:  Actually implement cleanbot targeting.
2013-12-31 17:33:14 -08:00
Ccomp5950
3448b24dad Removed debug messages. 2013-12-31 18:06:39 -06:00
Ccomp5950
eb93d0a188 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into albino_clone_fix 2013-12-31 18:04:16 -06:00
Ccomp5950
36f81bd9b0 DNA2 clone fix. No longer albino with blue beards.
Looks like a copy paste problem where the eye blocks were being set to facial blocks
and the math needed for s_tone wasn't being done.

Todo:  Fix clones not having unique_enzymes, /list being displayed in cloning pod, etc.
2013-12-31 18:02:48 -06:00
Ccomp5950
645710cb0b Bugfix: Actually implement cleanbot targeting.
Cleanbots won't attempt to clean up the same mess.

Also buffed how quickly they clean up dirt from 5 seconds to 2 seconds.

It was creating a blank list and then checking that list to see if anything else had
that mess targeted.  Removed the blank list check and added an actual check.
2013-12-30 21:59:20 -06:00
Zuhayr
9d4d14f107 Fix for low oxy tank at ninja spawn. 2013-12-31 11:37:21 +10:30
Zuhayr
441b015186 Fix for absurd dirt levels. 2013-12-31 11:34:35 +10:30
Zuhayr
25f7db1949 Fix for unremovable dirty tiles. 2013-12-31 11:32:36 +10:30
Zuhayr
4c371a3d0b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-12-31 10:25:54 +10:30
DJSnapshot
7a7eca4393 Merge pull request #4146 from Baystation12/dev-freeze
Dev-freeze --> Master staging [Going live!]
2013-12-30 13:52:21 -08:00
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
Mloc
1967a17715 Merge pull request #4126 from Zuhayr/dev-freeze
Removal of corgi dressup, uncommenting of ninja block in Check Antags.
2013-12-27 06:59:14 -08:00
Zuhayr
6f186d6bac Possible fix for href exploit in uplinks, unable to test locally. 2013-12-27 18:12:46 +10:30
Chinsky
92f169a72c Merge pull request #4124 from DJSnapshot/hotfix
Nerf to shield blobs
2013-12-26 22:09:06 -08:00
Zuhayr
183afc61bf Reverts corgi dress-up due to being terrible and duplicating items. 2013-12-27 11:06:20 +10:30
DJSnapshot
4f4e9bb000 Fix for the nuke disarm menu not showing up. 2013-12-26 16:27:05 -08:00
Zuhayr
661593718f Using dev-freeze map. 2013-12-27 10:42:13 +10:30
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
Chinsky
716a901858 Made ash dirty floors 2013-12-25 15:10:10 +03:00
Chinsky
022fdf1e19 Merge branch 'master' of https://github.com/comma/Baystation12 2013-12-25 02:47:26 +04:00
Chinsky
0b670f611d Makes ash disappear on attack_hand to solve issue where paper burned inside containers would create immovable pile of ash.
I could swear that's how ash behaved at some point, but then again, I am drunk
2013-12-25 00:58:20 +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
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
Ravensdale
9d9c797135 changes pushed to master branch instead of dev 2013-12-21 07:31:43 -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
8d76690f44 Fixes #4042 2013-12-18 10:30:59 +10:30
Zuhayr
0695774d24 Fixes #4050 2013-12-18 01:04:52 +10:30
Chinsky
b3248bf914 Merge pull request #4060 from DJSnapshot/dev-freeze
Improvements to how floors become dirty
2013-12-16 22:12:54 -08:00
DJSnapshot
b79ad45087 De-clunking the revised dirt code. 2013-12-16 22:07:31 -08:00
DJSnapshot
e112820ead Improvements to floors becoming dirty. They now become dirty over time instead of suddenly being really dirty at 50 steps. 2013-12-15 22:58:10 -08:00
Zuhayr
824b871902 Fixes the nuke suit spawn proc. 2013-12-15 14:50:24 +10:30
Zuhayr
92c4d6c66c Nook ops species-specific hardsuits on spawn. 2013-12-15 13:18:32 +10:30
Zuhayr
7940ac6cda Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-12-13 12:48:25 +10:30
DJSnapshot
a8eebd17d0 Grammar fix and fix to c45 being declared twice in boxes.dm 2013-12-08 12:25:00 -08:00
Zuhayr
502e39e341 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-12-08 12:22:31 +10:30
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
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