3ad160f98e
Merge pull request #6027 from fleure/airlockfix
...
Fixes multiple airlocks on same tile
2014-11-26 10:57:54 -08:00
096a7c3770
Merge pull request #6013 from tkdrg/dropthesoap
...
Fixes wizard slipping on all the area soaps
2014-11-26 11:36:31 -06:00
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
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
348de8bf1a
remove unnecessary checks
2014-11-24 21:56:05 -08:00
882e868e7b
Fixed runtime and added syndie headset protection
2014-11-24 21:54:09 -08:00
a24eeb7f93
Merge pull request #5758 from phil235/TorchFix
...
Fixes the torch and flare icons.
2014-11-24 15:18:08 -08:00
6030fc88c4
Merge pull request #5926 from tkdrg/plasmagrenadeopplsnerf
...
Fixes chem grenade phasing through windows/windoors
2014-11-24 13:19:21 -08:00
c0798bc67a
Whoops debug message :3c
2014-11-24 21:15:34 +00:00
918d47cc84
Made RCD have concurrent builds again
2014-11-24 21:11:19 +00:00
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
b5cfe103a9
You can now light someone's cigarette in his mouth with a lit match (just like with lighters or lit cigarettes)
2014-11-24 18:12:32 +01:00
99d364220f
code tidying
2014-11-24 06:21:44 -08:00
b6629bc636
fixes head of security and warden hats not having flashbang protection
2014-11-23 20:37:55 -08:00
86405fa8c0
Standardizes attack messages to always show the attacker first (when there is an attacker).
...
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
2014-11-24 01:49:34 +01:00
58df027021
Makes dice use overlays
2014-11-24 08:01:32 +11:00
35cbf8918e
Adds new undershirts, jeans and pants by WalterJe
...
Adds the undershirts by JStheguy
Ports some pants by JStheguy from NTstation
Ports the clothes vending machine from NTstation
Adds the clothesmate restock icon by WJohnston
2014-11-23 13:58:32 -03:00
e8ca9ec224
Fixes multiple airlocks on same tile
2014-11-23 16:32:24 +00:00
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
063a19c814
Fixes wizard slipping on all the area soaps
2014-11-22 19:24:57 -03:00
002ecddba3
Merge pull request #5849 from phil235/SoapMsgFix
...
Fixes the mouth washing message
2014-11-22 19:08:55 +01:00
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
7feaa1cf66
Merge pull request #5934 from paprka/defibbuff
...
Buffs defibrillator PNR to 5 minutes
2014-11-21 10:30:38 -06:00
678a13c451
moves emag effects from attackby() into atom proc emag_act()
2014-11-20 17:49:06 -08:00
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
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
b7d08c591e
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-18 16:23:04 +03:00
b071a0167e
Made explosions work in a slightly different way
...
Yep
2014-11-18 16:22:41 +03:00
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
639594c7f9
Merge pull request #5890 from Jordie0608/iwhoopsedalloverit
...
Fixes #5840 Improves stun baton messages
2014-11-17 11:46:06 -08:00
12ec40d246
buffs defibrillator PNR to 5 minutes
2014-11-16 21:22:05 -08:00
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
4b0ab2d52a
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-16 13:59:50 +03:00
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
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
705a264dcf
Makes data huds passive.
2014-11-16 01:52:06 -03:00
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
4f81da5bdf
Merge pull request #5797 from Steelpoint/BeltFix
...
Fix: SecBelts can hold Tear Gas Grenades
2014-11-15 01:03:46 +03:00
a4d0cfeba5
Merge pull request #5880 from phil235/FlashbangRuntimeFix
...
Fixes the flashbang runtime.
2014-11-14 22:38:00 +03:00
e771e8f91e
improves stun messages
2014-11-15 05:48:47 +11:00
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
17607d0aa2
Merge pull request #5776 from MrPerson/throwing_changes
...
Throwing bugfixes
2014-11-14 18:04:00 +00:00
e2a213879f
Fixes the flashbang runtime.
2014-11-13 18:31:42 +01:00
a248a1a4db
Conflicts:
...
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-11-13 17:33:32 +01:00
fe94f9cab0
Fixes a bunch of capitalization inconsistencies, adds names to vendors
2014-11-12 15:37:21 -08:00
65ba4f9764
Fixes the mouth washing message and the cleaning message appearing at the same time.
...
Lets monkeys wash a human's mouth.
2014-11-12 17:37:27 +01:00
b0d5e1b836
Fixes the lack of attack animation when using the stun baton on "on" and with intent other than harm.
2014-11-12 15:22:06 +01:00
f00d32abc1
Merge pull request #5803 from Menshin/sleeping_in_closets
...
Removes hilarious but useless sleep() in closets/boxes creation
2014-11-11 10:55:07 -08:00
613b450ac7
Better equip code
2014-11-10 19:25:58 +00:00
0b0dba724a
Added better nozzle deletion and removed qdel check
2014-11-10 19:09:34 +00:00
hornygranny
Cheridan
paprka
fleure
phil235
Jordie0608
tkdrg
Razharas
Swag McYolosteinen
Razharas
Incoming
Remie Richards