Commit Graph

4880 Commits

Author SHA1 Message Date
hornygranny 9ea01e3e44 Merge pull request #6107 from tkdrg/runtimesfuntimes
Fixes pacid chem grenade runtime
2014-11-28 16:35:01 -08:00
hornygranny e7d862b248 Merge pull request #6119 from Intigracy/recursivebyebye
Removes recursive explosions
2014-11-28 16:33:30 -08:00
Razharas da35b4dadc Merge pull request #6115 from CorruptComputer/pdashitstorm
Added a cancel button to the PDA
2014-11-28 20:52:38 +03:00
phil235 22e0771eb9 Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs. 2014-11-28 16:08:59 +01:00
Razharas b3f79777c9 Merge pull request #6092 from optimumtact/patch-1
Stop items having a negative throw force against grilles
2014-11-28 15:16:59 +03:00
Razharas 9e0d8c6ef6 Merge pull request #6094 from tkdrg/cuffmsg
Adds some feedback messages for handcuffing
2014-11-28 15:13:36 +03:00
MrPerson 62e9f21382 Removes a stray \red in robot_upgrades.dm 2014-11-27 23:21:35 -08:00
MrPerson 89030ad3f7 Redo cyborg icon updating
Removed the stupid "updateicon()" proc and placed the behavior in update_icons() and regenerate_icons()
Removed redundant update_fire() calls
Fixes #6057 since the staff calls regenerate_icons()
2014-11-27 23:04:35 -08:00
Intigracy 8a1baad03b forgot the var / proc 2014-11-27 14:50:21 -08:00
Intigracy 31835f1987 Removes the unused explosion_recursive.dm and everything related to it, including the configuration option. 2014-11-27 14:28:20 -08: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
CorruptComputer 058e342e95 Added a cancel button to the PDA 2014-11-27 14:27:00 -06:00
Remie Richards 22cdf41891 Items worn INSIDE armour only melt when that armour is melted, Backpacks, Belts and handheld items are all worn externally so melt regardless of armour
Also updates pixel_x and pixel_y randomisation of grey goo.
2014-11-27 17:16:58 +00:00
tkdrg 30477f00c4 Fixes pacid chem grenade runtime 2014-11-27 13:51:45 -03:00
Razharas 876a5b1bfb Fix for storages and equip
Yeah
2014-11-27 19:28:03 +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
Orange Borg c9665d4b2f Stop items having a negative throw force against grilles
This prevents the grille from gaining health if you hit it with something less than 5 tforce
2014-11-27 12:07:55 +13: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
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
paprka 483166e5ae detective bowman 2014-11-24 21:57:44 -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
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 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
paprka 99d364220f code tidying 2014-11-24 06:21:44 -08:00
paprka 6d86949742 removes flashbang protection from hats, gives it to bowman headsets 2014-11-24 05:55:13 -08: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 84e69cff6b Conflict resolve
Damn cables
2014-11-24 12:27:53 +03:00
paprka b6629bc636 fixes head of security and warden hats not having flashbang protection 2014-11-23 20:37:55 -08:00
phil235 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
Jordie0608 58df027021 Makes dice use overlays 2014-11-24 08:01:32 +11: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
tkdrg 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