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
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
b638388bdd
Uncommented ninja block in Check Antags.
2013-12-27 10:48:37 +10:30
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
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
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
c45f10f02b
Merge branch 'dev-freeze' of https://github.com/comma/Baystation12 into dev-freeze
2013-12-25 00:36:35 +04:00
Chinsky
ee6a18d94d
Adds White UI to selectable UIs
2013-12-24 23:05:41 +03: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
Chinsky
6630a046c9
Merge pull request #4095 from DJSnapshot/dev-freeze
...
Misc Fixes to guns
2013-12-23 04:38:44 -08: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
bda1297472
Merge branch 'master' of https://github.com/Zuhayr/Baystation12
2013-12-22 23:13:22 +10:30
Zuhayr
b9fcd34df3
Merged config and changelog.
2013-12-22 23:11:29 +10:30
DJSnapshot
1324be7189
Fix for guns eating empty magazines.
2013-12-21 23:15:36 -08:00
DJSnapshot
2f0b5e31f4
Fix so magazines read correctly on the Colt M1911.
...
Also notice for when the clip falls out.
2013-12-21 22:58:24 -08:00
Chinsky
a498de8356
Fixes #4075
...
Cannot turn around while unconscious or dead now.
2013-12-22 08:49:42 +04:00
Chinsky
19c83de6af
Applying Minifix to Yinaderp
...
ID of resulting chemical was not set, so reagents just disappeared
2013-12-22 07:55:03 +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
Chinsky
09efeaea5c
Fixed detective semiauto turning wrong caliber when screwdrived.
2013-12-17 22:32:23 +04:00
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
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
272d500e13
fix for accidentally deleted line.
2013-12-16 22:10:43 -08:00
DJSnapshot
c32df3852e
Added checks so that space cleaner reagent and borgs can clean floors now too!
2013-12-16 22:07:54 -08:00
