Spamcat
866a1c5feb
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze
2013-03-31 21:03:43 +04:00
Spamcat
dc2c87bc46
Fixed #2607
...
and #2600 - in previous commit
2013-03-31 14:26:44 +04:00
Chinsky
fabb43d38a
Merge pull request #2595 from Spamcat/BEF-staging
...
BEF staging
2013-03-29 06:18:51 -07:00
Spamcat
e424850568
Revert "Removed unneeded checks."
...
This reverts commit 53b0a3f8c3 .
*slaps himself* Don't touch what's working, chucklefuck.
2013-03-29 14:51:57 +04:00
Spamcat
53b0a3f8c3
Removed unneeded checks.
...
config.usealienwhitelist check is already in the function
2013-03-29 14:33:32 +04:00
Spamcat
6f1b9a44ab
Virology is working again.
2013-03-28 18:23:30 +04:00
Spamcat
288f0926fe
Made monkeys infectable,
2013-03-27 22:36:24 +04:00
Spamcat
4ad2ce87a6
bleh, removed stray debug thingy
2013-03-24 14:40:15 +04:00
Spamcat
285a1dd89e
Arrivals announcement computer strikes back!
...
phew, took me long to get rid of it
2013-03-24 02:20:57 +04:00
Spamcat
fcac941bc1
Fixed lizards being unable to spawn mid-round.
...
more dirty fixes, yay
2013-03-23 03:02:45 +04:00
Spamcat
5fefbb3e29
The the commit message.
2013-03-21 18:11:26 +04:00
Spamcat
593ded7983
Spiderbot quickfix.
2013-03-21 18:00:18 +04:00
Spamcat
3270b9cadf
Spiderbots drop held items when destroyed and show them when examined.
2013-03-21 16:01:09 +04:00
Asanadas
0a21e8a4f4
Whoops spelled internal affairs wrong. This pretty much overwrites the lawyer job with an Internal Affairs Agent, made to Cajoes guidelines to the best of my ability. New suit, messed up PDA, and loyalty implanted / answering to the captain to maybe they'll have more pull on the server.
...
Signed-off-by: Asanadas <asanadas@hotmail.com >
2013-03-21 02:59:29 -04:00
Spamcat
86cc28dd57
Fixed posibrain installed into spiderbot bug, made posibrains a child class of MMI.
2013-03-19 14:37:21 +04:00
Spamcat
76720abd6f
Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging
2013-03-19 11:17:32 +04:00
Christian Bielert
21de1ca08a
Merge pull request #2564 from Spamcat/bleeding-edge-freeze
...
BEF fixes
2013-03-18 11:42:56 -07:00
Spamcat
1758bf8314
Fixed spiderbots grabbing items out of reach.
2013-03-18 19:54:03 +04:00
Spamcat
e417ad2ec7
Fixed ghosts hearing whispers.
2013-03-18 18:03:53 +04:00
Nanodesu
e93e0cb0df
Fix runtime while electrocuting slime
2013-03-18 13:17:45 +04:00
Christian Bielert
14a96f77ab
Merge pull request #2539 from comma/organ
...
Organ code restructuring
2013-03-16 07:10:40 -07:00
Chinsky
8ec33904dc
Moved ruptured lung effects into lung processing
2013-03-15 18:28:44 +04:00
Cael_Aislinn
435ceda41f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-15 20:37:35 +10:00
Chinsky
13b6b2f61b
Moved organ and blood code to module folder.
...
Moved most organ and blood procs to that folder.
Refactored handle_organs a little.
Added comments in some places.
2013-03-14 11:52:53 +04:00
Chinsky
f8ae612991
Open incisions in surgery now bleed until closed or clamped.
2013-03-14 04:23:07 +04:00
Chinsky
b1bb564168
Fixed issue with #2154
...
Also moved selection of base icon for limbs to update_mutantrace so it's only doen when race is changed.
Changed mob icons a little, to get rid of rogue red pixel on torso that was not covered by arm
Moved awkward red spot where missing hand would be to arm sprite, since missing whole arm would still make stump appear there, and it looks weird.
2013-03-12 00:41:37 +04:00
Chinsky
7e82d9064c
Head blows now can cause brain damage.
2013-03-11 04:59:24 +04:00
Chinsky
52ad4929d1
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-03-11 01:18:43 +04:00
Chinsky
b207349c44
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-03-11 01:18:10 +04:00
Chinsky
ced88e1569
Ported HUD functionality.
...
Sec HUDs showing brief of sec record.
Med HUDs changing status and showing brief of med record.
2013-03-11 01:11:56 +04:00
Chinsky
611bd1c6e9
Removed ability to use radio while stunned again.
2013-03-11 00:38:16 +04:00
Chinsky
e60bef91bd
Added indication for when someone speaks into radio.
2013-03-11 00:27:18 +04:00
Cael_Aislinn
f8f9397636
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
...
Conflicts:
icons/obj/library.dmi
icons/obj/storage.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-10 23:01:33 +10:00
Christian Bielert
10c3beae24
Merge pull request #2514 from comma/master
...
Goatee fix.
2013-03-10 05:01:50 -07:00
Chinsky
cf423fe979
Fixed Goatee and Male Skrell Tentacles.
2013-03-10 15:37:33 +04:00
Chinsky
cce3e8e4e9
Merge pull request #2503 from CIB/feature
...
Improved brainloss effects.
2013-03-09 05:48:19 -08:00
cib
58186ce7e0
Improved brainloss effects.
...
- Will drop items/fall down with a lot of brainloss now, headache and blurry vision with small brainloss.
- Removed stupid effects, like random messages and headbutting airlocks.
- Cloning now will leave you at lower health and cause small amounts of brainloss.
2013-03-09 10:35:20 +01:00
Christian Bielert
c31abc3b05
Merge pull request #2502 from comma/gunmode
...
Aiming Mode
2013-03-09 00:13:19 -08:00
Asanadas
b82070ecd8
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-03-06 18:10:47 -05:00
Chinsky
5a916019de
Refactored and moved targeting code around a little.
...
Refactored suicide and point blank shooting code to use their projectiles properties instead of huge chain of conditions with arbitrary values.
2013-03-07 00:44:28 +04:00
Chinsky
55671d7485
Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
icons/mob/screen1_old.dmi
2013-03-06 17:04:45 +04:00
Cael_Aislinn
53793fc2aa
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
...
Conflicts:
baystation12.dme
code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
icons/obj/storage.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-06 19:03:18 +10:00
cib
aa4deb2b89
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
2013-03-04 12:20:38 +01:00
cib
65b8eafe8e
Added internal organs.
...
They can be hurt by their parent organ getting hurt.
Ruptured lungs are now represented as damage to the lungs internal organ.
2013-03-04 12:19:12 +01:00
Zuhayr
6c15bb5bfa
Forgot to update the emag code so that the bots explode.
2013-03-04 04:14:44 -08:00
Zuhayr
810c9bea70
Added verbs to spiderbot, tweaked access.
2013-03-04 03:26:52 -08:00
Zuhayr
3774b16839
Made spiderbots buildable, animated spiderbot sprites.
2013-03-02 02:15:39 -08:00
Zuhayr
e17038636f
Added spiderbots! Adminspawn only currently. They take an occupied MMI or posibrain, can crawl through vents and hide, shock people, and go 'beep'.
2013-03-01 14:28:58 -08:00
Zuhayr
15984f6a14
Fix for posibrains, modification to posibrain brainmob for admin use, updated posibrain sprites, addition of spiderbot sprites for a later project.
2013-03-01 01:38:32 -08:00
Chinsky
97b547d5d3
Merge pull request #2440 from Zuhayr/master
...
Robot changes, Set Flavour verb.
2013-02-25 01:19:08 -08:00