Commit Graph

3844 Commits

Author SHA1 Message Date
Remie Richards
eeea775d67 Merge pull request #6188 from tkdrg/miauwpls
Fixes the new AI lawcap config option
2014-12-06 23:55:15 +00:00
Cheridan
4b9f8972cf Merge pull request #6184 from phil235/PosterRippingSpamFix
Fixes being able to rip posters more than once
2014-12-05 15:13:18 -06:00
Cheridan
7a13804890 Merge pull request #6191 from phil235/RestrainedTableClimbingFix
Makes table climbing while restrained take twice as long.
2014-12-05 10:35:32 -06:00
Cheridan
3330b991ed Merge pull request #6034 from Jordie0608/whatwerethechancesofthishappening
Makes dice use overlays
2014-12-05 10:15:45 -06:00
Cheridan
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
hornygranny
bc9d9f6d58 Merge pull request #6105 from RemieRichards/AcidProtectionUpdate
Acid protection update
2014-12-03 10:28:47 -08:00
phil235
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
Swag McYolosteinen
1d6a7cf031 Merge pull request #6106 from Razharas/StorageFix
Fix for storages and equip
2014-12-03 17:50:58 +01:00
Swag McYolosteinen
780059bc41 Merge pull request #6093 from optimumtact/patch-2
Add feedback to window construction/deconstruction
2014-12-03 17:48:55 +01:00
Swag McYolosteinen
9618c11a60 Merge pull request #5480 from Perakp/wormholeProjector
Bluespace wormhole projector
2014-12-03 17:42:49 +01:00
Remie Richards
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
phil235
d840fa74ac Makes table climbing while restrained take twice as long.
Making tablepush and climb_table procs a bit more oop.
Fixes typo in glass table climbing message.
Table-pushing someone is now logged.
Adding a check to table climbing to return if table is destroyed mid-climb
2014-12-02 23:25:36 +01:00
tkdrg
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
hornygranny
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
phil235
656a533b1a Fixes being able to rip posters more than once by opening multiple confirmation windows beforehand. 2014-12-02 20:44:28 +01:00
Razharas
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
xxalpha
260ee75c9a Fixes several description related issues with fancy storage 2014-11-30 22:03:25 +00:00
Orange Borg
97f10f6812 Add feedback to window construction/deconstruction
Users didn't get any feedback when the process started
2014-12-01 10:36:26 +13:00
Razharas
c8817469fc Merge pull request #6124 from MrPerson/eye_lmao
Redo cyborg icon updating
2014-11-30 22:46:37 +03:00
Menshin
efb50e374a Made obj/item/weapon/storage call ..() on New() 2014-11-30 03:14:49 +01:00
Perakp
48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-11-29 09:37:40 +02:00
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