Commit Graph

3784 Commits

Author SHA1 Message Date
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
hornygranny
fb3c9d7d11 Merge pull request #6062 from TZK13/yeloww
Fixes yellow wardrobes being invisible when you closed them
2014-11-26 10:57:30 -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
7214eddedb Merge pull request #6044 from phil235/WindoorExploitFix
Fix windoor construction exploit.
2014-11-25 12:41:44 -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
TZK13
93370c7d93 Fixes yellow wardrobes being invisible when you closed them. 2014-11-24 21:41:33 -06: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
hornygranny
402d5a368b Merge pull request #5997 from tkdrg/guyspls
Fixes HTML injection exploit with blueprints
2014-11-24 13:18:11 -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
phil235
1f4a071940 Fixing a similar bug with door assembly. 2014-11-24 13:21:25 +01:00
phil235
b725206f3a Fix windoor construction exploit. 2014-11-24 13:12:00 +01:00
Razharas
717fb78278 Merge pull request #5994 from phil235/RadLaserAnimFix
Traitor health analyzer stops doing attack animation and hitsound
2014-11-23 23:41:46 +03:00
fleure
e8ca9ec224 Fixes multiple airlocks on same tile 2014-11-23 16:32:24 +00:00
Cheridan
e1b5a6815b Merge pull request #5856 from tkdrg/anotherbrickinthewall
Wall cleanup, attempt #2
2014-11-22 17:04:34 -06: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
tkdrg
2b5c67fb36 Fixes blueprint HTML injection exploit 2014-11-22 14:32:10 -03:00
phil235
d6c2cb4df5 Fix the traitor health analyzer (radiation laser) making the attack animation and hitsound when used on target. Changing one span class and removing one text() stuff. 2014-11-22 17:36:02 +01:00
hornygranny
dce9dadea2 Merge pull request #5914 from paprka/removewindows
Changes most border windows/firelocks to full tile
Gets paprika killed
2014-11-21 11:47:04 -08:00
Cheridan
7feaa1cf66 Merge pull request #5934 from paprka/defibbuff
Buffs defibrillator PNR to 5 minutes
2014-11-21 10:30:38 -06:00
Cheridan
448d0fab7f Merge pull request #5913 from tkdrg/yearslater
Makes cyborg modules NODROP
2014-11-21 10:17:53 -06:00
Cheridan
a9199118e5 Merge pull request #5925 from paprka/flashfix
Fixes flashes being useless
2014-11-21 10:14:39 -06:00
paprka
41c86dd557 fixes disarming affecting area stuns 2014-11-21 08:06:07 -08: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
Cheridan
8bfed4258b Merge pull request #5922 from Steelpoint/BeretHoS
HoS Beret + Warden Drill Hat
2014-11-19 10:26:27 -06:00
paprka
bda5947d30 improves firelocks, window damage, and window deconstruction 2014-11-18 18:25:47 -08:00
Cheridan
1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix
Atmos z level fix + radio controller code sanitization
2014-11-18 17:05:14 -06:00
Cheridan
c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1
All mechs get a melee attack
2014-11-18 12:53:52 -06: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
Cheridan
53d913bc7f Merge pull request #5924 from tkdrg/junk
Removes unticked unused code from the tree
2014-11-17 13:34:49 -06:00
Remie Richards
85f735c504 Merge pull request #5878 from phil235/DroneShardFix
Fixes drones cutting their hands when using shards.
2014-11-17 09:55:19 +00:00
paprka
12ec40d246 buffs defibrillator PNR to 5 minutes 2014-11-16 21:22:05 -08:00
paprka
537c0705c9 health tweak to be additionally rounded 2014-11-16 20:54:19 -08:00
paprka
8ee2330c0f fixed metastation, fixed basic window having no icon state 2014-11-16 17:57:29 -08:00
paprka
4822519c44 adds help intent check for repairing windows 2014-11-16 17:35:06 -08:00
paprka
c009049033 added window repairing 2014-11-16 17:26:55 -08:00
paprka
fd910387c3 windows damage and such 2014-11-16 17:13:33 -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
paprka
007ab4dd08 shuttle windows 2014-11-16 15:59:46 -08:00
paprka
649be7cf8a Fixes flashes being useless 2014-11-16 14:39:50 -08:00
paprka
706e03bd1b Full tile window placing on grilles 2014-11-16 14:29:39 -08:00
tkdrg
608dec814e Removes old/unused code from the tree. Use version control if you need it for some reason. 2014-11-16 16:53:18 -03:00