hornygranny
9ea01e3e44
Merge pull request #6107 from tkdrg/runtimesfuntimes
...
Fixes pacid chem grenade runtime
2014-11-28 16:35:01 -08:00
Razharas
9e0d8c6ef6
Merge pull request #6094 from tkdrg/cuffmsg
...
Adds some feedback messages for handcuffing
2014-11-28 15:13:36 +03:00
hornygranny
b573a00f5e
Merge pull request #5918 from Razharas/Cfour
...
Who am i kidding, its explosions rework for a long time already
2014-11-27 13:58:56 -08:00
hornygranny
bc7a7a7452
Merge pull request #6084 from tkdrg/hudindahood
...
Fixes data/antag HUD bugs
2014-11-27 13:50:34 -08:00
Razharas
d2848e5f95
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-28 00:32:30 +03:00
tkdrg
30477f00c4
Fixes pacid chem grenade runtime
2014-11-27 13:51:45 -03:00
tkdrg
7153becc62
Fixes implants not updating the implant secHUD
...
Makes med huds /carbon because of monkeys
Makes HUDs update after implant removal surgery
Fixes cloning not recovering antag huds
2014-11-27 12:56:17 -03:00
Razharas
275d7fdd77
Merge pull request #6038 from paprka/hatfix
...
fixes head of security and warden hat flashbang confusion
2014-11-27 17:14:51 +03:00
Razharas
c5209f2399
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-27 15:30:37 +03:00
tkdrg
afbc910505
Adds some feedback messages for handcuffing.
2014-11-26 21:27:53 -03:00
hornygranny
7bfd789b4d
Merge pull request #5959 from tkdrg/boxin
...
Makes storage items update properly on insertion
2014-11-26 11:05:09 -08:00
hornygranny
3ad160f98e
Merge pull request #6027 from fleure/airlockfix
...
Fixes multiple airlocks on same tile
2014-11-26 10:57:54 -08:00
Cheridan
096a7c3770
Merge pull request #6013 from tkdrg/dropthesoap
...
Fixes wizard slipping on all the area soaps
2014-11-26 11:36:31 -06:00
hornygranny
21b8df82d5
Merge pull request #5908 from tkdrg/hud
...
Makes data and antag huds passive and creates /datum/atom_hud
2014-11-25 12:53:03 -08:00
hornygranny
c915ea8ebd
Merge pull request #6049 from phil235/LatexballoonFix
...
Fixes latexballons icon update problem and the infinite burst issue.
2014-11-25 12:40:38 -08:00
paprka
348de8bf1a
remove unnecessary checks
2014-11-24 21:56:05 -08:00
paprka
882e868e7b
Fixed runtime and added syndie headset protection
2014-11-24 21:54:09 -08:00
hornygranny
a24eeb7f93
Merge pull request #5758 from phil235/TorchFix
...
Fixes the torch and flare icons.
2014-11-24 15:18:08 -08:00
hornygranny
6030fc88c4
Merge pull request #5926 from tkdrg/plasmagrenadeopplsnerf
...
Fixes chem grenade phasing through windows/windoors
2014-11-24 13:19:21 -08:00
fleure
c0798bc67a
Whoops debug message :3c
2014-11-24 21:15:34 +00:00
fleure
918d47cc84
Made RCD have concurrent builds again
2014-11-24 21:11:19 +00:00
phil235
fd1abc6436
Fixes laterballons icon update problem and the infinite burst issue. Blowing it now requires to attack the balloon with a tank not the other way around. Adding a message when you blow up the latexballoon. You can burst the balloon with a hot weapon like a lit lighter (is_hot() items)
2014-11-24 19:35:14 +01:00
paprka
99d364220f
code tidying
2014-11-24 06:21:44 -08:00
paprka
b6629bc636
fixes head of security and warden hats not having flashbang protection
2014-11-23 20:37:55 -08:00
fleure
e8ca9ec224
Fixes multiple airlocks on same tile
2014-11-23 16:32:24 +00:00
Razharas
3511e0dada
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
...
Conflicts:
code/game/turfs/simulated/walls.dm
Ye somth liek dat
2014-11-23 17:46:14 +03:00
tkdrg
063a19c814
Fixes wizard slipping on all the area soaps
2014-11-22 19:24:57 -03:00
Swag McYolosteinen
002ecddba3
Merge pull request #5849 from phil235/SoapMsgFix
...
Fixes the mouth washing message
2014-11-22 19:08:55 +01:00
phil235
0bc84e120e
Merge branch 'master' of https://github.com/tgstation/-tg-station into TorchFix
...
Conflicts:
icons/mob/items_lefthand.dmi
Adding PR 5829 to my PR so both can be merged now.
2014-11-22 18:56:31 +01:00
Cheridan
7feaa1cf66
Merge pull request #5934 from paprka/defibbuff
...
Buffs defibrillator PNR to 5 minutes
2014-11-21 10:30:38 -06:00
tkdrg
e03c5129da
Makes storage items update properly on insertion
...
Previously, it would only update the storage view for usr, so it would
look wrong to any other players which are interacting with the same
storage item at the same time.
2014-11-20 14:00:17 -03:00
Cheridan
0da09e3f6b
Merge pull request #5557 from Incoming5643/magicmania1.76
...
Magic Mania 1.76: Lets outrun the feature freeze
2014-11-20 09:07:41 -06:00
Razharas
b7d08c591e
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-18 16:23:04 +03:00
Razharas
b071a0167e
Made explosions work in a slightly different way
...
Yep
2014-11-18 16:22:41 +03:00
Razharas
e205c8f2f6
Merge pull request #5857 from paprka/lolnames
...
Fixes a bunch of capitalization inconsistencies, adds names to vendors
2014-11-18 03:46:26 +03:00
hornygranny
639594c7f9
Merge pull request #5890 from Jordie0608/iwhoopsedalloverit
...
Fixes #5840 Improves stun baton messages
2014-11-17 11:46:06 -08:00
paprka
12ec40d246
buffs defibrillator PNR to 5 minutes
2014-11-16 21:22:05 -08:00
tkdrg
fd0387c151
Fixes chem grenade phasing through windows/windoors. Changes chem grenade reactions to be slightly more realistic, volume-wise.
2014-11-16 21:23:56 -03:00
Razharas
4b0ab2d52a
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-16 13:59:50 +03:00
Razharas
3a9c5be027
Fix of c4 incorrect behaviour
...
Yes yes its a bug there is issue with it and its called a bug and this a
a bug fix not a feature dont freeze
2014-11-16 13:59:36 +03:00
Razharas
54299ac9b4
Merge pull request #5812 from fleure/nozfix
...
Fixes nozzle deleting and adds some safety to nozzle toggling
2014-11-16 13:44:42 +03:00
tkdrg
705a264dcf
Makes data huds passive.
2014-11-16 01:52:06 -03:00
Incoming
fbbc77f905
Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76
...
Conflicts:
code/modules/projectiles/projectile/magic.dm
2014-11-15 14:44:51 -05:00
Razharas
4f81da5bdf
Merge pull request #5797 from Steelpoint/BeltFix
...
Fix: SecBelts can hold Tear Gas Grenades
2014-11-15 01:03:46 +03:00
Razharas
a4d0cfeba5
Merge pull request #5880 from phil235/FlashbangRuntimeFix
...
Fixes the flashbang runtime.
2014-11-14 22:38:00 +03:00
Jordie0608
e771e8f91e
improves stun messages
2014-11-15 05:48:47 +11:00
Remie Richards
da8acb2ded
Merge pull request #5845 from phil235/StunBatonAtckAnimFix
...
Fixes the lack of attack animation when using the stun baton a certain way
2014-11-14 18:17:37 +00:00
Remie Richards
17607d0aa2
Merge pull request #5776 from MrPerson/throwing_changes
...
Throwing bugfixes
2014-11-14 18:04:00 +00:00
phil235
e2a213879f
Fixes the flashbang runtime.
2014-11-13 18:31:42 +01:00
phil235
a248a1a4db
Conflicts:
...
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-11-13 17:33:32 +01:00
