cib
0201e83fcb
Merge branch 'master' of github.com:CIB/Baystation12
2012-12-06 15:15:25 +01:00
cib
6ab420237b
Attack log will now store type path for bullets.
2012-12-06 15:14:17 +01:00
cib
ecb12fb4db
Merge branch 'master' of git://github.com/comma/Baystation12
2012-12-06 16:50:28 +04:00
giacomand@gmail.com
76151212c7
Committing Malkevin's fix for syndie cakes not having doctor delight in them.
...
I added a warning log message when a non-existing reagent is trying to be added, to avoid this in the future.
Committing SuperSayu's fix for conveyor belts moving items that were just taken off the belt.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5269 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 12:21:46 +00:00
ericgfwong@hotmail.com
9eb7f9bc5b
Made a couple of AI alerts more noticeable.
...
Updated changelog with instructions to use the new channel.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5268 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 06:00:37 +00:00
ericgfwong@hotmail.com
b5b2ee470f
Updated supply headset names and instructions
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5267 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 00:46:16 +00:00
ericgfwong@hotmail.com
a3780d7021
Renamed Cargo radio to Supply radio
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5266 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 00:16:11 +00:00
ericgfwong@hotmail.com
f7abe34c72
Removed mining department radio frequency. Miners and Cargo techs will all be under the Cargo radio instead.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5265 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 23:27:10 +00:00
petethegoat@gmail.com
3ac67f339a
Fixed randomised appearances being batshit crazy.
...
Improved the janicart a bit. It should be less cursed now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5264 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 22:27:16 +00:00
ericgfwong@hotmail.com
0974845f8c
Slight remapping of the mining dock to make it more compact and closer to cargo
...
Mining shuttle now stuns unbuckled carbon mobs for 3 ticks.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5262 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 21:48:19 +00:00
giacomand@gmail.com
dc63fb4cd0
-Re-implemented fireballs to use dumbfire, so you don't choose a target but instead it just shoots in the direction of the user. Changed the cooldown back to 10.
...
-Forgot to add the staff of animation to the list of available spells. Fixes a runtime.
-Gave the clown the under-used water flower which squirts a unit of water.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5261 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 17:54:58 +00:00
d_h2005@yahoo.com
57d907f00e
Agent cards can copy access levels off other IDs now, removing the need for traitors to carry around their old IDs if they want to get into their own departments - and allows them to copy the access of others subtly.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5260 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 16:15:45 +00:00
Cael_Aislinn
8ae901e49d
fixed data preservation, removed debugging
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-05 11:52:19 +10:00
Cael_Aislinn
21e00aa5dc
some tweaks
2012-12-05 04:55:50 +10:00
Cael_Aislinn
defcbdc0ac
Merge branch 'test_branch' into work_in_progress
2012-12-05 04:48:10 +10:00
Cael_Aislinn
bc3b0757fc
added functional bunsen burner (with placeholder sprite), added capability for heated chem recipes, added preservation of data across chemical reactions for xenoarch (not sure if it actually works, seemed a bit buggy), added tungsten as a dispensable reagent for xenoarch
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-05 04:47:48 +10:00
Cael_Aislinn
3257a529ba
fixed up the core sampler + gave it a placeholder sprite, made geo data actually persist across turfs and ores, cleaned up some new xenoarch stuff
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-05 04:44:42 +10:00
aussprites
5f36fdcea7
added ..() to new(), thanks to Giacom for telling me why
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5258 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-04 18:38:03 +00:00
giacomand@gmail.com
7a24d16b03
-I forgot to put back the spawn()s when I was testing whether they were needed or not.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5257 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-04 17:01:34 +00:00
giacomand@gmail.com
fc90b08e1c
-Changed the limits of the server room alarm to fix Issue 1143.
...
-Changed the singularity code a bit. Checking for the last movement had some problems, I changed it around. It fixed Issue 1121.
-In addition of this, the singularity will now move diagonally. It doesn't get stuck in the corners of the field now.
-Mimics which are structures, have density and anchored will be able to knockdown people and be twice as strong.
-Doubled the amount of times the staff of animation can fire before needing to recharge, since it had to shoot way more than the staff of change to be effective.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5256 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-04 16:55:04 +00:00
aussprites
1dd83e6803
>added defines to flora.dm
...
>added icon_states to ausflora.dmi
>added a tree to pinetrees.dmi
>centcom came by and decorated the trees in the bar and chapel
Centcom Report
Have a merry griffmas and a happy new round.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5255 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-04 14:23:00 +00:00
giacomand@gmail.com
45d98a271e
-Fixes Issue 1142. Thanks to carn for the solution to the issue. The tags were being cut off and there were multiple areas of the same tag, so when locating with the tag it gave out unpredictable results.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5254 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-04 11:10:43 +00:00
Cael_Aislinn
c173b0fcc3
Merge branch 'work_in_progress' of github.com:caelaislinn/Baystation12 into work_in_progress
2012-12-04 18:20:19 +10:00
Cael_Aislinn
1a998e804d
cleaned up and commented airflow code, fixed a bug in airflow where items airflow'd items could move other things around, removed myself from admins (it is such a dreadful bother to have to re-add myself all the time, I don't know how anyone could stand it)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-04 18:18:38 +10:00
Jim "Apples"
84bcc87e45
Merge pull request #2027 from SweeperM/master
...
Fixes to lighting
2012-12-03 03:09:02 -08:00
Cael_Aislinn
f7d41058ed
Merge branch 'work_in_progress' of github.com:caelaislinn/Baystation12 into features
2012-12-03 18:56:16 +10:00
Cael_Aislinn
39f07d50bf
Merge https://github.com/Baystation12/Baystation12 into features
2012-12-03 18:54:21 +10:00
Cael_Aislinn
cc2771d4d5
thrown facehuggers only have a 25% chance of hitting now, and they have a chance to miss when leaping normally
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 13:58:58 +10:00
Cael_Aislinn
ee04fd9f1e
significantly reduced alien disarm-stun time (from 10-15 seconds to 0.5-3 seconds), reduced stun chance, added a 25% chance to stun the alien, reduced alien heal rate on weeds from 5 to 1 (they still heal toxin damage at a rate of 5)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 13:54:29 +10:00
Cael_Aislinn
d09d7bf313
changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 13:50:57 +10:00
Cael_Aislinn
6d1ea0548d
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress
...
Conflicts:
code/modules/customitems/item_defines.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 13:08:47 +10:00
johnsonmt88@gmail.com
35cb1b2530
Removed storage.dm from defines and moved the storage item defines to the location of their respective procs.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5252 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 19:00:33 +00:00
Chinsky
f0ac799952
Merge branch 'bandages'
2012-12-02 21:17:11 +04:00
Cael_Aislinn
d55170ab97
fixed an extra line added
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-03 01:04:14 +10:00
petethegoat@gmail.com
1cb3959037
Moved janicart into structures, and fixed some issues with it. You can now hook a trashbag onto it.
...
Recoloured the purple softcap to actually match the janitor's jumpsuit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5250 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 14:48:57 +00:00
cib
77943e04f3
Balance fix to random blob event.
...
It now lasts 20 minutes instead of 5, and accordingly each blob
advancements happens every 30 seconds instead of every 7 seconds. This
means more time to respond to the blob, but overally the blob can still
be just as harmful if nothing is done about it.
2012-12-02 13:58:57 +01:00
cib
bce8c4cfee
Merge github.com:Baystation12/Baystation12
2012-12-02 13:36:10 +01:00
Chinsky
507dc0c496
Better feedback messages and ability to target groin, hands and feet.
2012-12-02 16:30:24 +04:00
giacomand@gmail.com
85ea98f131
-Mimics will attack other mimics which are created with a different staff.
...
-Fixed the AI eye falsesafe from not working.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5249 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 11:13:00 +00:00
aranclanos@hotmail.com
4f010d9730
Fixes issue 1138 - Stashing lockers on crates.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5248 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 08:01:12 +00:00
giacomand@gmail.com
9941bb8587
Added mimics! There's the classic crate (chest) mimic which waits until somebody is close before trying to attack them. You can fill him with loot by putting items on him on your map. This was done by changing the base initialize proc to an /atom/movable and then instead of looping through the world for objects, instead loop for atom movables.
...
The next type of mimic is for the staff of animation! They will copy the icon of the object they're copying and will set themselves stats based on the object too. They will not attack the bearer of the staff which made them animated.
Added the option to get the staff on the wizard's spell book.
Added a "friends" var to hostile mobs. It will make the simple animal ignore friends when choosing targets.
Changed the statues from /obj/effect/showcase to /obj/structure/showcase.
Added a new variable to projectiles, "shot_from" is the gun that shot the projectile. It's used to determine what staff animated the mob and it will then add that staff, so it can ignore it when choosing targets.
Added a wander var for simple animals, turning it to 0 will stop the simple animal from moving when idle.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5246 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 04:38:43 +00:00
baloh.matevz@gmail.com
79f9733f4a
- Fixed the updated permission panel to work with the database system.
...
- Added lights and power to oldstation for whatever reason.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5245 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 23:32:22 +00:00
giacomand@gmail.com
1f7fc25d77
-Fixed PDAs randomly sending gibberish.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5244 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 21:13:58 +00:00
Chinsky
66d0f554f6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-12-02 00:14:03 +04:00
Chinsky
0a9b6f6bbe
Removed armor suit from Captain's spawn gear
2012-12-02 00:03:30 +04:00
Chinsky
0b614a488c
Made bandages stop bleeding when applied, not waiting until next 20-tick organ update cycle.
2012-12-02 00:02:43 +04:00
Chinsky
ab440fbf7d
Fixed compile error in custom items.
...
Made rigs protect against radiation again.
2012-12-01 18:35:27 +04:00
Cael_Aislinn
3b6c00eae5
made space ninja a toggleable client option
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-01 18:07:18 +10:00
Cael_Aislinn
c8f603cebd
WIP stuff for skin styles sprite accessory
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-01 18:07:02 +10:00
Cael_Aislinn
7e3f58cea2
CPR optimisations, made hypospray visible on the map
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-01 18:06:19 +10:00