Commit Graph

4458 Commits

Author SHA1 Message Date
Dorsisdwarf 77106e033b Updates description and capacity variable 2014-12-06 11:38:15 +00:00
Dorsisdwarf 6149d834f7 Buffs the RCD 2014-12-06 11:24:13 +00:00
Cuboos fb6e756502 Defib sounds plus Code
Defibt sounds added plus code edits to accept new defib sounds and new weapon sounds

Defib previews
https://dl.dropboxusercontent.com/u/9654207/def_saftyOff.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_charge.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_failed.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_ready.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_SaftyOn.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_success.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_zap.ogg
2014-12-05 22:18:34 -08:00
phil235 be1b02059f Merge branch 'master' of https://github.com/tgstation/-tg-station into RecursiveHearVisibleMessage
Conflicts:
	code/game/machinery/doors/windowdoor.dm
	code/game/mecha/mecha.dm
	code/game/objects/structures.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
2014-12-05 22:02:01 +01:00
Razharas 7758a0afed Ok now explosions shall work properly
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
Cheridan 3330b991ed Merge pull request #6034 from Jordie0608/whatwerethechancesofthishappening
Makes dice use overlays
2014-12-05 10:15:45 -06:00
paprka 9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08:00
tkdrg acd956179b Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-12-04 20:47:29 -03: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
Ergovisavi 08d28b4f47 Fixes various issues with Backpack Watertanks / Defibs by slapping NODROP on them
Changes all watertanks and the defib to use the Atmos watertank equip method
Fixes a runtime that could happen if someone melted the Atmos watertank off of you
2014-12-04 09:27:10 -08:00
phil235 d545eb7f9f Visible_message() now uses recursive_hear_check so mob inside something can see those messages. Fixes being able to see visible_message w/o seeing the src of it (happened when the src could see us but not the other way around), you no longer see visible_message from mobs inside closets for example.
Fixes pAI being deaf.
Removing some no longer needed occupant_message() in mecha code.
Fixed some typos and span class here and there.
2014-12-04 01:08:04 +01:00
fleure 3d6a4a7bfb Fixes toggling watertank nozzle in hands with verb 2014-12-03 18:58:08 +00: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
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
Menshin ba44b325d3 Finished the exofab revamp:
* designs are now using the construction time var and the hacky /obj/item/mechavars is gone
* designs updated : there shouldn't be "no material" designs anymore
* cleaned the objects of their construction_cost and construction_time vars
* fixes the material name being displayed with $ character before
* this also fixes the overlay animation in inserting sheets
* the category var is now a list, so parts can be build/used with several chassis (fixes the Firefighter Chassis appearing when building Ripley)
* properly fix the href vulnerability when emptying (you can now remove all sheets of a materiel at once)
* the exofab now won't create a material sheet if there's not enough material (e.g 1000 metal)
* the exofab now won't accept a sheet if it would overstuff it (losing some material in the process)
* cleaned the code a bit (simplified, streamlined, using global vars, etc)

Finish #5722 and fixes #5954.
2014-12-02 23:00:22 +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
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
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
iamgoofball 42973c8b67 Goon Chemistry Commit 2 2014-11-29 17:15:57 -08:00
Perakp 7f357963bd - Fixes belts getting stuck in drone inventory. Fixes #5563.
- Gives drones the ability to interact with APCs and air alarms without requiring them to have an ID card. Fixes #5565.
- Drones have to be adjacent to the APC/alarm when using it, for balance.
2014-11-29 14:36:36 +02:00
hornygranny 9ea01e3e44 Merge pull request #6107 from tkdrg/runtimesfuntimes
Fixes pacid chem grenade runtime
2014-11-28 16:35:01 -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 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
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
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
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
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 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 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
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