Commit Graph

3062 Commits

Author SHA1 Message Date
comma
d5942c4b10 Updated HUDs to find only known viruses. 2013-07-09 13:04:05 +04:00
comma
1095bd1978 Merge branch 'bleeding-edge-freeze' into viro 2013-07-09 12:49:23 +04:00
comma
ae2a9c56ad Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2013-07-09 12:48:34 +04:00
Segrain
c5a1a69b5b Stealth/invisibility tweaks. 2013-07-09 05:06:29 +03:00
Segrain
72588c8c61 MedHUDs and virus2. 2013-07-09 04:51:09 +03:00
Mloc-Argent
75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00
Spamcat
c8eb9df6ac How do I grammar? 2013-07-08 22:56:35 +04:00
Spamcat
0e153b7226 Updated pulse checking on examine, optimized handle_pulse(), fixed some grammer.
xoxo chinsky
2013-07-08 22:37:54 +04:00
Mloc-Argent
3ce4e2ad17 Fixes #2559
Changes Add-Note and Notes verb to be under the IC category, instead of OOC.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-06 22:20:13 +01:00
Zuhayr
b84697055f Embedded item string fix. 2013-07-07 00:07:18 -07:00
Zuhayr
587b2d8f24 Cyborg sprite selection fix. 2013-07-07 00:00:25 -07:00
Zuhayr
ee560d43da Allowed ties to use mask sprites if equipped to the face, for accessories like lockets. 2013-07-06 23:53:24 -07:00
Segrain
a2d3edcaff More fixes. 2013-07-05 21:56:25 +03:00
Segrain
5abed5a5f6 Modtype tweak. 2013-07-05 20:10:39 +03:00
Zuhayr
349851313e Typo. 2013-07-05 23:34:44 -07:00
Zuhayr
aeec95b350 Robot immortality fixes. 2013-07-05 23:31:27 -07:00
Zuhayr
0cfaf8e70b Minor string fix. 2013-07-05 22:15:40 -07:00
Zuhayr
a2249fb1dc Fixes yank out verb string issues. 2013-07-05 22:01:09 -07:00
cib
f10c08253f Fixed two bugs with robot components.
1. They could be broken but still powered.
2. Melee damage didn't work at all.
2013-07-05 13:43:11 +02:00
Spamcat
f7dc8f8c0a derp 2013-07-05 04:50:18 +04:00
Spamcat
3a1ea41ff2 Moar machinery. 2013-07-05 04:39:57 +04:00
Spamcat
24eddd6eaa Now 100% more machinery! 2013-07-05 04:12:41 +04:00
Spamcat
6e61fe3914 Initial pulse code. WIP 2013-07-05 03:11:50 +04:00
Zuhayr
a8ea0a3fd4 Bot shield not working against melee fix. 2013-07-04 23:23:22 -07:00
Zuhayr
dc3485ab2d Indenting issue. 2013-07-04 20:37:10 -07:00
Zuhayr
0852a9f4b1 Partial fix for #3236 2013-07-04 20:34:37 -07:00
Zuhayr
0140738157 Merge branch 'BEF-staging' of https://github.com/Baystation12/Baystation12 2013-07-04 20:26:55 -07:00
Zuhayr
681fcb2881 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-07-04 15:26:06 -07:00
Zuhayr
db650d3757 Config merge. 2013-07-04 14:39:46 -07:00
cib
0eb1b2d12c Implemented updatehealth() for robots
Fixes a bug of them never dying.
2013-07-04 09:46:47 +02:00
Zuhayr
b4695d3d74 Merge pull request #3232 from Ravensdale/master
Custom synthetic sprites and minor bugfixes
2013-07-03 22:21:15 -07:00
Ravensdale
34cd183d22 blrg... didn't update my ai code before commiting, should be fixt 2013-07-03 21:54:39 -07:00
Ravensdale
9aedfa8b23 Bugfix: Fixes mining borg's radio to the supply frequency since mining frequency no longer exists.
Feature: Introduces and adjusts code for cyborg and AI custom sprites

Cleanup: Streamlined the AI core selection code. Could probably be even cleaner but it's good for now.
2013-07-03 21:24:25 -07:00
Segrain
d14c2a515c Quickfix. 2013-07-03 06:16:59 +03:00
Segrain
66265e2689 Recordskeeping update. 2013-07-03 05:55:18 +03:00
Mloc-Argent
cf4bd39f6e Updated the linkage between the NanoTrasen IRC bot and the server.
- Server will now send adminhelps to the admin channel, with information if there is no admins online.
- Server will inform the admin channel if the last admin online logs out.
- When a round ends, the server will alert the main channel, supplying some statistics.
Additionally, laid the groundwork for an external scripts system.
This is fully configurable/togglable in the config.txt file.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-02 23:41:40 +01:00
Zuhayr
cf4248b9c9 Combat cyborg module shields and mobility. 2013-07-02 01:39:22 -07:00
Zuhayr
fe4629734e Fixes #3210 2013-07-01 19:09:56 -07:00
comma
50f94ddd93 Merge branch 'bleeding-edge-freeze' into viro 2013-07-01 17:33:24 +04:00
comma
da884f4ddc Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro 2013-07-01 17:23:09 +04:00
comma
5d9a3f12a1 Fixed humans being lukewarmblooded. Now only severe temperature differences will affect internal body temperature, so it will revert back to normal after a bit. 2013-07-01 17:08:21 +04:00
Whitellama
6d8654eb7a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-06-30 20:02:36 -07:00
Chinsky
59f4717096 Merge pull request #3211 from misterbook/bleeding-edge-freeze
Pulling the teeth from bees, lowering halloss regen
2013-06-30 10:04:29 -07:00
Chinsky
04e4318304 Merge pull request #3206 from Zuhayr/feature
Cyborg cleanup, fix.
2013-06-30 10:01:16 -07:00
Zuhayr
19680cb2ba Compile fix. 2013-06-30 05:15:33 -07:00
Zuhayr
b33e91fbb1 Cleaned up a lot of the module selection code, added Combat module. 2013-06-29 22:14:43 -07:00
Zuhayr
bd864f6dc0 Fixes #3204 2013-06-29 21:12:41 -07:00
MisterBook
2661f8e8ea Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-29 23:06:39 -05:00
MisterBook
b9fb3538b1 Pulled the teeth out of bees. Less damage, will not attack you unless they are pissed off (And then, only when the target of their rage has disappeared). Will no longer murder you from seven tiles away. Bio defenses lowered - having only a helmet means they can't get to 30% of your body. Only a suit means they can't get to 70% of your body. Full coverage? Full protection. All spacesuits have bio armor, so covers pressure sealed suits too.
Turned down halloss regen. Added flashing pain and an owie message when you get shot by tasers. Feel that agony.
2013-06-29 23:05:06 -05:00
Zuhayr
c10137a118 Fixes #3184 2013-06-29 19:08:41 -07:00