eeea775d67
Merge pull request #6188 from tkdrg/miauwpls
...
Fixes the new AI lawcap config option
2014-12-06 23:55:15 +00:00
3330b991ed
Merge pull request #6034 from Jordie0608/whatwerethechancesofthishappening
...
Makes dice use overlays
2014-12-05 10:15:45 -06:00
f909d59d1a
Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
...
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
dcb48e3168
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-12-03 18:59:32 +01:00
1d6a7cf031
Merge pull request #6106 from Razharas/StorageFix
...
Fix for storages and equip
2014-12-03 17:50:58 +01:00
88ad308825
Merge pull request #6144 from Menshin/storage_calling_super
...
Made obj/item/weapon/storage call ..() on New()
2014-12-03 16:38:43 +00:00
6194c0b90f
Fixes the new AI lawcap config option
...
Previously, it would include null entries in some of the lists, which
meant that the total law amount would be grossly exaggerated.
Fixes #5846
2014-12-02 18:27:06 -03:00
c683849747
Merge pull request #6160 from xxalpha/somethingsomethingreturnnull
...
Fixes a couple description related issues with fancy storage
2014-12-02 13:13:53 -08:00
0b5ae9899e
Merge pull request #6125 from MrPerson/span_classes_never_heard_of_them
...
Removes a stray /red in robot_upgrades.dm
2014-12-02 15:54:17 +03:00
260ee75c9a
Fixes several description related issues with fancy storage
2014-11-30 22:03:25 +00:00
c8817469fc
Merge pull request #6124 from MrPerson/eye_lmao
...
Redo cyborg icon updating
2014-11-30 22:46:37 +03:00
efb50e374a
Made obj/item/weapon/storage call ..() on New()
2014-11-30 03:14:49 +01:00
9ea01e3e44
Merge pull request #6107 from tkdrg/runtimesfuntimes
...
Fixes pacid chem grenade runtime
2014-11-28 16:35:01 -08:00
da35b4dadc
Merge pull request #6115 from CorruptComputer/pdashitstorm
...
Added a cancel button to the PDA
2014-11-28 20:52:38 +03:00
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
9e0d8c6ef6
Merge pull request #6094 from tkdrg/cuffmsg
...
Adds some feedback messages for handcuffing
2014-11-28 15:13:36 +03:00
62e9f21382
Removes a stray \red in robot_upgrades.dm
2014-11-27 23:21:35 -08:00
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
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
bc7a7a7452
Merge pull request #6084 from tkdrg/hudindahood
...
Fixes data/antag HUD bugs
2014-11-27 13:50:34 -08:00
d2848e5f95
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-28 00:32:30 +03:00
058e342e95
Added a cancel button to the PDA
2014-11-27 14:27:00 -06:00
30477f00c4
Fixes pacid chem grenade runtime
2014-11-27 13:51:45 -03:00
876a5b1bfb
Fix for storages and equip
...
Yeah
2014-11-27 19:28:03 +03:00
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
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
c5209f2399
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-27 15:30:37 +03:00
afbc910505
Adds some feedback messages for handcuffing.
2014-11-26 21:27:53 -03:00
7bfd789b4d
Merge pull request #5959 from tkdrg/boxin
...
Makes storage items update properly on insertion
2014-11-26 11:05:09 -08:00
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
402d5a368b
Merge pull request #5997 from tkdrg/guyspls
...
Fixes HTML injection exploit with blueprints
2014-11-24 13:18:11 -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
99d364220f
code tidying
2014-11-24 06:21:44 -08:00
6d86949742
removes flashbang protection from hats, gives it to bowman headsets
2014-11-24 05:55:13 -08:00
84e69cff6b
Conflict resolve
...
Damn cables
2014-11-24 12:27:53 +03: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
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
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
Remie Richards
Cheridan
phil235
Swag McYolosteinen
tkdrg
hornygranny
Razharas
xxalpha
Menshin
MrPerson
Razharas
CorruptComputer
paprka
fleure
Jordie0608