Commit Graph

10238 Commits

Author SHA1 Message Date
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
Spamcat
5f690e150d Part 3: fixing shit 2013-07-06 02:53:06 +04:00
Spamcat
63de302a09 Part 2: construction. 2013-07-06 02:53:03 +04:00
Spamcat
0e4271f97c Stage 1: deconstruction. 2013-07-06 02:53:01 +04:00
Spamcat
87feed7e7b Nice colours (and a minor bugfix) 2013-07-06 02:53:00 +04:00
LordBraindead
6f0ebc1bb5 changed how fire works
-fire switched to release energy by burning fuel and generating heat from that
- reorganzied the fire process in a saner manner
2013-07-05 19:56:53 +01:00
LordBraindead
7345b059a3 changed variable settings for the change in fire.dm
added one new variable
deleted three variables that are no longer used
2013-07-05 19:56:45 +01:00
Segrain
a2d3edcaff More fixes. 2013-07-05 21:56:25 +03:00
LordBraindead
ff912e132b readjusted composition of syndie bombs
set them to produce a 1-2-5 explosion for the fire changes
2013-07-05 19:55:28 +01: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
8f596f5fc1 Air alarm runtime fix. 2013-07-05 22:32:37 -07:00
Zuhayr
0cfaf8e70b Minor string fix. 2013-07-05 22:15:40 -07:00
Zuhayr
60b9d0f8fc Compile fix. 2013-07-05 22:09:27 -07:00
Zuhayr
a2249fb1dc Fixes yank out verb string issues. 2013-07-05 22:01:09 -07:00
Zuhayr
b6699cbf9a Adds ammo to vox spawning with a crossbow. 2013-07-05 21:57:51 -07:00