Menshin
ea6d74992f
Fixed a typo that can prevent gun firing message from appearing.
2015-01-02 17:51:34 +01:00
tkdrg
cdb5066502
Merge pull request #6324 from Razharas/GenShit
...
Added datum mutations
2014-12-31 17:24:15 -03:00
phil235
183955a877
Fixes shortening barrel: only live chambered ammo goes off in your face; the gun goes off even if not in your hand; when blowing up "you fire the X" message won't show up anymore.
2014-12-31 12:04:39 +01:00
Razharas
f7e6552e33
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-29 17:05:20 +03:00
tkdrg
80cc2d4100
Merge pull request #6622 from Thunder12345/grammarFixes
...
Fixes for some grammer and formatting issues
2014-12-29 10:20:35 -03:00
Razharas
10b21b20ab
Conflicts resolution
...
In items weapons melee misc
2014-12-29 11:49:30 +03:00
tkdrg
dc6f1895fe
Merge pull request #6608 from paprka/disablerrebuff
...
Reverts disabler nerf
2014-12-29 01:12:52 -03:00
Razharas
76a21883a8
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/structures/tables_racks.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/projectiles/gun.dm
Fixes dem conflicts
2014-12-28 11:20:15 +03:00
Razharas
208b59c30e
Fixed stuff tkdrg pointed out
...
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
tkdrg
bf25d38fb2
Merge pull request #6607 from paprka/aiturrets
...
Fixes ai turrets having disable mode instead of stun
2014-12-28 02:21:04 -03:00
tkdrg
c57c75b232
Merge pull request #6604 from paprka/disablerhitsound
...
Disabler now makes a sound when it hits
2014-12-28 02:06:55 -03:00
Thunder12345
faf5a1dd07
Fixes #6547
...
Shortening a shotgun now uses proper grammar, and displays the original
name of the shotgun for the finish message:
"X shortens the improvised shotgun"
instead of:
"X shortens the sawn-off improvised shotgun"
2014-12-27 18:19:04 +00:00
Swag McYolosteinen
7ee2317ec3
Merge pull request #6207 from phil235/RecursiveHearVisibleMessage
...
Mob inside something can now see visible_message()'s
2014-12-27 13:20:50 +01:00
paprka
ad188e2e4d
additional buff
2014-12-26 21:00:13 -08:00
paprka
69c22e99a9
reverts disabler nerf
2014-12-26 20:53:53 -08:00
paprka
ef1d60061b
fixes ai turrets having disabler modes
2014-12-26 20:52:21 -08:00
paprka
19f9da1a99
disabler now makes a sound when it hits
2014-12-26 20:29:52 -08:00
paprka
109be766d6
fixes a few bugs
2014-12-26 19:23:22 -08:00
paprka
615f3f3488
Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd
...
Conflicts:
code/modules/mob/living/damage_procs.dm
code/modules/projectiles/projectile.dm
2014-12-26 16:14:19 -08:00
paprka
21df99154d
Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya
...
Conflicts:
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/obj/gun.dmi
2014-12-25 13:51:43 -08:00
paprka
595ad8df58
fixed compile errors
2014-12-24 21:03:22 -08:00
paprka
7842ff8803
adds advanced tasers as default
2014-12-24 19:41:40 -08:00
paprka
1d1baa96bc
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-24 18:56:26 -08:00
phil235
8707e37845
Fixes russian revolver being abusabled. You can no longer use it on someone other than yourself. Aiming somewhere other than head/eyes/mouth doesn't instakill but still deals damage. You need to spin the chamber after each shooting attempt. Only humans can use the gun.
...
Making a can_trigger_gun() proc that tests if the mob can trigger the gun.
2014-12-23 21:08:00 +01:00
Razharas
1b45752b05
Fixed conflicts
...
Ye again and again and again and again
Do it again, do it again~
2014-12-23 05:39:39 +03:00
paprka
47659dbbf4
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-21 20:32:34 -08:00
Razharas
9a27fe7c8d
Conflict fix
...
Yeah makes it all work
2014-12-21 06:12:33 +03:00
Menshin
20c640ae38
Added some defines for better clarity
2014-12-21 02:10:01 +01:00
Menshin
05378c014d
* fixes #3765 (shotguns sawing off)
...
* fixes #994 (clumsy guns firing)
* fixes #6443 (laser tags firing without vest on)
* fixes #6262 (optimizing revolver reloading)
2014-12-21 01:35:49 +01:00
phil235
2481bef95f
Changed the visible_message procs and audible_message procs, they now use the new get_player_mob_hearers_in_view() proc instead of a recursive proc.
...
I removed some duplicated code from tools/tools.dm
Fixed two typos with span class.
2014-12-20 17:29:23 +01:00
Cuboos
0bb7d2a5a5
Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
...
Conflicts:
code/game/objects/items/weapons/defib.dm
config/admins.txt
2014-12-15 18:12:14 -08:00
Razharas
f0c8f2eeac
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
conflicts resolution
2014-12-16 02:52:08 +03:00
paprka
10695c16b0
fixes everything, updates jitter amount
2014-12-15 01:00:53 -08:00
paprka
1fd9e6bfda
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/obj/gun.dmi
2014-12-14 21:55:28 -08:00
paprka
ddfac78cf2
initial commit for adding jitteriness for electrodes
2014-12-14 21:47:29 -08:00
Cheridan
753202d008
Merge pull request #6341 from paprka/gunspritefix
...
Fixes a few bugs with gun and ammo icons
2014-12-14 23:26:36 -06:00
paprka
e6f88851ac
Adds select fire for burst fire weapons
2014-12-14 20:13:09 -08:00
paprka
0c2ed6ab8f
Fixes a couple missing var settings
2014-12-14 05:15:13 -08:00
paprka
dddacbc245
Burst fire for automatic weapons
2014-12-14 05:06:19 -08:00
paprka
ea69908122
Buff mech smg bullets a little, added changelog
2014-12-13 23:31:46 -08:00
Razharas
21a2c2d21e
Made clumsiness into disability
...
I really dont want to make clumsy_act()
2014-12-14 08:04:48 +03:00
paprka
30cbff2802
fixes a few bugs with gun and ammo icons/obj/gun.dmi
2014-12-13 17:13:25 -08:00
Razharas
11f6c7c401
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-12 04:51:16 +03:00
Razharas
0921aa201f
Added datum mutations
...
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
Thunder12345
3bc8b4f777
Description update
...
Changed the description of the FRAG-12.
2014-12-11 21:23:16 +00:00
Thunder12345
a0476d975e
Movin' house
...
Moved /obj/item/projectile/bullet/frag12 from
code\modules\projectiles\projectile\bullets.dm to
code\modules\projectiles\projectile\special.dm
2014-12-11 21:23:15 +00:00
Thunder12345
8e2dc381ed
FRAG-12 + admins.txt
...
+ FRAG-12 shotgun shells, created from the unloaded technological
shotshell
+ Adding myself to admins.txt
2014-12-11 21:16:45 +00:00
paprka
2315660b9f
added range to the 40mm grenade
2014-12-10 23:57:12 -08:00
paprka
dc01a092af
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/obj/gun.dmi
2014-12-10 23:55:51 -08:00
paprka
b65df8425f
trims some unnecessary code
2014-12-10 22:56:52 -08:00
