Zuhayr
6a714f3613
Merge pull request #3300 from Spamcat/master
...
meatfix revert
2013-07-12 01:26:34 -07:00
Spamcat
c27f3efb8e
Merge branch 'master' of github.com:Baystation12/Baystation12
2013-07-12 03:06:41 +04:00
Spamcat
4ceb12bb1c
Revert "Quickfix for INFINIMEAT."
...
This reverts commit 654a83be9d
2013-07-12 03:03:46 +04:00
Segrain
b5b58e5ebe
Runtime error fix.
2013-07-12 00:00:59 +03:00
Segrain
f7b22fa911
Quickfix.
2013-07-11 23:14:56 +03:00
Cael_Aislinn
e4b4486768
added a spawning guide to EFTPOS devices
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-07-12 03:40:38 +10:00
Cael_Aislinn
4421bede17
moved money accounts into a global list + removed db syncing (some procs could be global but left where they are for convenience), fixed an issue with latejoiners having no account, fixed a runtime
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-07-12 03:40:06 +10:00
comma
da35278439
Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro
...
Conflicts:
html/changelog.html
2013-07-11 02:53:58 +04:00
Chinsky
67cc13751a
Derp.
2013-07-11 02:09:01 +04:00
Mloc
e820e28f78
Merge pull request #3292 from comma/master
...
Fixes
2013-07-10 14:36:32 -07:00
comma
47c6901df3
Fixes #3018
...
Should stop intercept report from trying to tell that wizards, ninjas and nuke operatives are trending to be crew members ( they are not ).
2013-07-11 01:30:16 +04:00
comma
81e22ea270
Fixes wires on air alarm not displaying cut status properly.
...
Fixes #3087
2013-07-11 00:59:44 +04:00
comma
c791208efc
Made deconstruction/construction possible. Added hints ot examine since icon is same during whole process.
2013-07-11 00:18:03 +04:00
Spamcat
10b0ef11ab
Fixed #3290 .
...
<_< you saw nothing >_>
2013-07-10 22:58:23 +04:00
comma
45e775f5e9
Standardized proc definitions in alarm code.
2013-07-10 22:49:10 +04:00
comma
f1cfb96dab
Fixes #3225 . Adds separate toggle for LOOC.
...
Fixes #3285 . Changes way hearers are found, so it includes pAIs now.
Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.
2013-07-10 22:39:27 +04:00
comma
bdaeb2c6fb
Adds fire delay to all weapons (except automatics).
...
For most weapons it is only slightly bigger than clicking own delay, but still can see difference between revolver and SMG.
Shotungs do not get special delay because they are slow as they are anyway.
Biggest delays go to laser cannon (40 damage per shot) and pulse rifle, ~2 seconds for one shot.
2013-07-10 21:19:21 +04:00
Spamcat
fc294110cc
Merge branch 'master' of github.com:Baystation12/Baystation12
2013-07-10 20:55:42 +04:00
Zuhayr
a8a474bca9
Changed combat module to VV only pending rebalancing.
2013-07-10 07:20:06 -07:00
comma
1a03079a66
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into viro
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
2013-07-09 23:08:41 +04:00
Segrain
21ac3e5954
Fix for #3286 .
2013-07-09 21:08:31 +03:00
Segrain
46df500cd4
Fix for #3166 .
2013-07-09 19:37:17 +03:00
Segrain
a3d2a1e70f
Fix for #3281 .
2013-07-09 17:17:55 +03:00
fauxtada
c41abfc929
Edits contents of virology biohazard closets to be more virus resistant. Now with robust internals!
2013-07-09 07:02:17 -07:00
comma
722d4d27fb
Fixed a typo.
2013-07-09 16:07:58 +04:00
comma
e0f7097c23
Makes engineered viruses airborne too, since otherwise they are nigh useless.
2013-07-09 14:16:58 +04:00
Spamcat
aa1310a44f
Fixed a potential runtime and removed buggy mobs from gold slime's spawn list as per raven's request.
2013-07-09 13:40:04 +04:00
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
14dbcad07d
HUDs and visibility.
2013-07-09 04:53:34 +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
df90824d60
Whoa, 2 barsign.dm's? WTF?
2013-07-08 23:25:13 +04: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
Chinsky
31fc09567f
Merge pull request #3264 from Mloc/master
...
Small fixes
2013-07-06 14:59:13 -07:00
Zuhayr
78653b3175
Removes visible tallies from votes.
2013-07-07 02:42:28 -07:00
Zuhayr
e9210b0701
Removed jobbanned and random pick drafting in understaffed modes, and implements voter-based forcedrafting.
2013-07-07 02:28:34 -07: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
Mloc-Argent
94af89d0a2
Fixes #2091
...
Adds missing topic() code for page selection on player notes, properly alphabeticalizes.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-06 22:16:01 +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
ad07f5e9e5
Added procs for a custom item that were overlooked.
2013-07-06 23:53:59 -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
Zuhayr
9a2ce35199
Commenting out ninja mode, as it is broken.
2013-07-06 21:53:11 -07:00
Segrain
82c3e6aa8c
Fix for #3255 .
2013-07-06 16:51:59 +03:00
Segrain
6804cf0518
Fix for #3254 .
2013-07-06 16:50:01 +03:00
Zuhayr
9dec8e311c
Merge pull request #3252 from Segrain/bleeding-edge-freeze
...
Examining cyborgs.
2013-07-06 00:30:09 -07:00
