Commit Graph

443 Commits

Author SHA1 Message Date
Miauw 3f9bf15ca5 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
Conflicts:
	code/modules/mob/mob.dm
2014-02-15 17:30:21 +01:00
hornygranny e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
hornygranny 04aeb15af7 Rebalanced strange throwforces 2014-02-13 17:47:25 -08:00
Miauw 9b8656247c u_equip is now called unEquip PANIC 2014-02-13 20:58:33 +01:00
Miauw b8b57ff4f1 Replaced canremove with NODROP. 2014-02-13 19:52:46 +01:00
MrPerson e602febd40 Merge pull request #2713 from Tenebrosity/the-lit-the-lit-the-lit-the-lit-the-lit
Fixes misc grammar issues
2014-02-12 15:17:17 -08:00
Tenebrosity f70c8d29d9 Fixes misc grammar issues 2014-02-10 19:46:33 +13:00
Ergovisavi 892ffd3879 Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul 2014-02-09 22:37:20 -08:00
Ergovisavi bf17c3328e Asteroid Overhaul v1.0
Mining Equipment Locker and associated items
Asteroid map rework
Mining Mob rebalancing
Minor fixes
2014-02-09 19:51:05 -08:00
Tkdrg 6245d00a4d Now with 100% more procs! 2014-02-08 18:22:56 -03:00
Tkdrg c43ba64484 Merge branch 'master' of https://github.com/tkdrg/-tg-station into ultrahardelitebugfix
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
2014-02-08 17:50:31 -03:00
Tkdrg c316ff3365 Nitpick, ho! 2014-02-08 14:58:51 -03:00
Ergovisavi 62ede5d1ae Merging the Asteroid Map overhaul and Mining Equipment/Locker into one pull, added Mining Scanner, changed mesons
Tweaks on how caves are spawned and how mobs are spawned on the asteroid
2014-02-07 00:18:45 -08:00
YotaXP d2e5c3a51b Inserting lights into containers should no longer dim other lights. 2014-02-05 23:05:29 -05:00
Tkdrg 61a8a25e1a Fixes #2627 and line endings (?). 2014-02-05 15:03:15 -03:00
Neerti bdd288174a I love invalid paths, don't you? 2014-02-04 10:28:55 -05:00
Razharas 8dc864d819 Merge pull request #2605 from Neerti/SecBeltsReloaded
Attempt 2: Stun Batons can now go on your belt.
2014-02-03 21:49:45 -08:00
Razharas ee3b0a77ca Merge pull request #2598 from tkdrg/morebagsyay
Book bags for the librarian
2014-02-03 20:20:04 -08:00
fleure 2f0ca13d45 Merge pull request #2575 from Jordie0608/truebagshavenolimitations
Bag of holding now holds everything
2014-02-03 10:47:44 -08:00
Cheridan ad235cf18f Merge pull request #2563 from Razharas/NewTables
New PR for crafting tables
2014-02-03 08:46:56 -08:00
Neerti 100585b33a Enables the baton and classic baton to go on your belt. Adds an additional slot in the belt so you won't have to make room. 2014-02-03 01:31:39 -05:00
Tkdrg 6fb71e6174 Added book bags. The librarian now spawns holding one. 2014-02-02 04:46:34 -03:00
Cheridan 1d54687b2b Merge pull request #2477 from Tenebrosity/Branch_Branch_attacksounds
Attack sounds for all melee weapons
2014-02-01 18:01:59 -08:00
Jordie0608 831608e664 Increased max_combined to 35 2014-02-01 15:54:08 +11:00
Jordie0608 f8e359cc35 Bag of holding now holds everything 2014-02-01 04:11:15 +11:00
Razharas b4f011bacb Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts
2014-01-31 05:20:59 +04:00
Ergovisavi e766b585c1 Equipment Locker and Ore Redemption Unit v1.0 2014-01-29 11:47:34 -08:00
Jesus Hussein Chris 52339906c4 Attack sounds for all melee weapons
Weapons that do no damage play a tap sound, except for the bike horn and banhammer.

Adds a different attack message for forceless attacks. It says tapped or
patted on instead of attacked in.

Adds force zero check to armour before attempting to block attacks.

Adds hitsounds to the welder, lighter, matches, cigarettes, energy sword and energy axe for when they're on and off.

Adds 5 force to the lighter when it's lit. Same as when you accidentally burn yourself lighting it. Adds a hitsound and the correct damage type to the lighter.

Adds hitsound volume scaling based on the weapon's force and its weight class. Adds tap sound scaling based on a weapon's weight class.

Removes boldness from item attack messages on non-human mobs. The attack is still bolded for the player
controlling the mob.

Adds a force check to blood spurts when attacking non-human mobs. If the weapon doesn't have a force, no blood will come out.

Adds adminhelp.ogg as the banhammer's hitsound with Cheridan's permission.

Adds a much needed period to the catatonic human examine message.

Makes the activation and deactivation sounds of toy swords, energy swords and energy shields quieter. What an earsore.

Makes description, item_state and name of matches that have burned out on their own consistent with those put out by the player. Changes match, cigarette and lighter attack verbs and forces based on whether they're lit or not.

Fixes a bug that allowed players to light cigarettes with burnt matches.

Names lit cigarettes and children of cigarettes lit [name].

Fixes a bug with the energy blade that kept it at weight class 5 after it was deactivated.

Changes the welder out of fuel message slightly to be less fragmented.

Removes dead air from most of the weapon sound effects used in this pull to make them more responsive. In other words, the fire extinguisher sound will play a lot sooner after you click than before. Equalised their peak volumes to all be -0.1dB and in an attempt to make altering volumes based on force more consistent.

Thank you @YotaXP for help with the item_attack.dm attack messages.

Thank you @optimumtact for help with code for testing item_attack volumes.

Thank you @Giacom for help with the code for scaling hitsound and tap sound volume by hitforce.

Thank you @Tastyfish for telling me why my proc wasn't working.

Thank you to anyone else on #coderbus who helped me who I've forgotten to mention.
2014-01-28 22:46:41 +13:00
Incoming c0d41485a3 Removes the "SmoothOperator" bundle for being dreadful compared to the other bundles
Bundle included
Stetchkin (TC ???): the gun we gave nuke ops to tell them they had to buy their own guns now. Has nonrefillable ammo.
A silencer (TC 2): makes the gun a normal item (one of its only pluses was it was a small item).
Syndie Soap (TC 1): slips forever.
A Trash Bag (TC 0): It's a bulky item so once you take it out of the box you're stuck explaining to everyone why you're carrying a trashbag as not a janitor.
A Body Bag (TC 0): Obtensibly to drag off corpses without leaving a mess... but then why do they get the soap?
A Suit (TC 0): Availible for free in the locker room closet
Lace Up Shoes (TC 0): "Shoot me, I'm valid!"

Since you can't buy a Stetchkin I can't give it an absolute value, except to say that it's worse in almost every respect to the revolver. which is 6.

Even if you are VERY charitable and give it the full 6 valuationyou still have a bundle that awards you less than 10TC of items where every other bundle awards you more than 10TC (that's the point of taking a bundle).

http://www.youtube.com/watch?v=RiMOKmp0uZc
2014-01-26 22:41:48 -05:00
Razharas ea54257ab6 Ported cable coils to stacks crudely
Yeah
2014-01-22 02:11:19 +04:00
Razharas 0dcb8a8042 Fixes borgs and ghosts storages
Fixes #2084
2014-01-18 03:23:02 +04:00
Aranclanos f81ae6fb34 Adds the captain's medal to the medal's lockbox.
Fixes issue 2358
2014-01-15 19:10:30 -03:00
sirbayer eb20908dcf Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets 2014-01-13 14:08:57 -08:00
dumpdavidson cf672d2c29 Balance changes to the EMP kit:
- EMP-Flashlight now has one charge less but recharges (slower than lasers/energy crossbows do)
- EMP-Flashlight description no longer reveals the nature of the device
- EMP implant now has two uses
- EMP kit now contains two grenades
- EMP and adrenaline implants now inform the user how many charges they contain to begin with (freedom doesn't because it's intentionally random)

- Fixes EMP flashlight sometimes going down to -1 charges.
2014-01-11 21:04:35 +01:00
sirbayer 45cb745b6b Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
Conflicts:
	code/modules/projectiles/guns/magic.dm
2014-01-06 17:59:15 -08:00
sirbayer f4542ee258 Scattershot ho! 2013-12-30 20:43:10 -08:00
Cheridan bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Aranclanos d5ddac3a00 Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
Robson Richards d3d4c79946 Merges Heal_Damage and Heal_robotic_damage procs
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
fleure 171147b1bf Fixed toolbox parent object giving error 2013-12-28 14:51:35 +00:00
Cheridan b9efeaa932 Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
Item name fixing round3
2013-12-26 23:14:15 -08:00
Miauw 0c8c6a5de2 Fixed #1119 folding boxes updates sprites properly 2013-12-22 19:21:45 +01:00
Kyrah Abattoir df626a1f06 correct paint can names and plural status, corrected pill box names, corrected lockbox names. 2013-12-22 11:28:10 +01:00
Perakp c40af6ae40 Update icons after item is placed in cart. 2013-12-21 09:50:15 +02:00
Perakp 65e0931d55 Merge branch 'master' into janitorCartFix
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
Perakp 68ff764463 Subtypes of janiborg tools
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
2013-12-18 20:44:24 +02:00
Aranclanos 7bb4cf6a79 Makes the attackby() of storage objects return 0 if the can_be_insterted() fails. This will fix hand labelers on pill bottles. 2013-12-18 12:25:39 -03:00
Razharas 358a85eb3d Completed the transition to a new proc
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
Giacomand ceec829294 Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950. 2013-12-13 21:14:23 +00:00
Kyrah Abattoir 3496dc4e0a Merge branch 'master' into ItemNameFixingRound3 2013-12-10 17:32:45 +01:00