Commit Graph

1325 Commits

Author SHA1 Message Date
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
Cheridan
e60ecbb1f4 Merge pull request #2590 from GarrusVakarian/issue#2436fix
Fixed issue #2436 (Classic baton stuns borgs)
2014-02-02 16:08:45 -08:00
GarrusVakarian
94bbf55ce3 Adapted code to Jordie0608's fix 2014-02-02 18:01:46 +01:00
fleure
68abd1f0e4 Merge pull request #2510 from Tenebrosity/throwsounds
Removes throwtapsound var from items
2014-02-02 04:33:23 -08:00
GarrusVakarian
30c4694487 Adapted to fit programming standard 2014-02-02 05:22:39 +01: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
GarrusVakarian
f71ffde259 Fixed issue #2436 (Classic baton stuns borgs) 2014-02-02 02:05:15 +01: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
Malkevin
302376eeeb Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/game/objects/items/toys.dm
2014-01-30 19:14:43 +00:00
fleure
3a0d12838a Merge pull request #2528 from RobRichards1997/28/01/2014-Cyberlimb-Sanity
Adds sanity checks to Robotlimb repairs [BUGFIX]
2014-01-30 10:40:12 -08:00
fleure
cb318996b5 Merge pull request #2524 from Incoming5643/ImUpset
Removes the "SmoothOperator" bundle
2014-01-30 10:25:26 -08:00
Tenebrosity
0851b341da - Removes the throwtapsound var from items. It was unnecessary.
- Thrown items play throwhitsound on impact. If no throwhitsound is defined, they play hitsound instead. If that isn't defined, they play genhit.ogg. The latter fixes \#2508. The volume of the sound is dependant on the item's throwforce and/or weight class.

- Adds 15 throwforce to the fireaxe, which previously had only 1.
2014-01-29 10:51:14 +13:00
Robson Richards
859d909a2b Adds sanity checks to Robotlimb repairs 2014-01-28 17:03:25 +00: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
Malkevin
a1c4c4bbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/modules/mob/mob.dm
2014-01-26 19:22:33 +00:00
Balrog
461415430e Merge remote-tracking branch 'origin/master' into inb4gambittraitor
Conflicts:
	icons/obj/toy.dmi
2014-01-26 14:02:35 -05:00
Balrog
c5a2f28a47 Refactored card vars. Fixed some broken card deck instances on the map. 2014-01-26 13:55:57 -05:00
Ergovisavi
cc738f7dcd Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium 2014-01-24 16:33:51 -08:00
fleure
e8573cc416 Merge pull request #2373 from RobRichards1997/14/01/2014-Bug-Fixes
Robotic Repair Missing fixes [Fixes #2326]
2014-01-24 11:17:54 -08:00
Razharas
c17de66cbc Added chem handling and IED recipe
Uh oh
2014-01-24 03:55:09 +04:00
Razharas
b8528875be Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable 2014-01-23 04:08:10 +04:00
Giacomand
4b51e6d386 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2371 2014-01-22 20:01:11 +00:00
Giacomand
6a497b98ad Added the SetEmagged proc, for cyborgs, and replaced code to use it.
Added get_inactive_modules and get_usable_modules procs to use while looping through the cyborg's modules.
The cyborg's storage screen will now shrink if there is an empty row.
Added a new on_emag proc for modules, which is called when the module is emagged. Miner borgs use it to replace their borg drill for a diamond one.
Fixes a runtime where there is no client to update the hud.
Fixes a bug where if you emag a cyborg with no module and when they choose a miner they do not receive their diamond drill.
2014-01-22 20:00:39 +00:00
fleure
da5ef34c29 Merge pull request #2461 from JJRcop/nuke-toy-tweaks
Nuke toy tweaks
2014-01-22 07:52:13 -08:00
Cheridan
290180dec8 Merge pull request #2387 from MrPerson/Animation_OLD
Mobs use animate() to rotate
2014-01-21 20:39:12 -08:00
MrPerson
9058921972 Merge branch 'master' of https://github.com/tgstation/-tg-station into Animation_OLD
Conflicts:
	code/game/objects/items/weapons/shields.dm
	code/modules/events/ninja.dm
	code/modules/mob/living/carbon/human/update_icons.dm

No more cloakers, no more cloak_stacks. Also removed that silly "I'll make an icon and then make an image of that icon" bullshit.
2014-01-21 15:19:27 -08:00
Razharas
785fc6f153 Fixes racks 2014-01-22 03:18:37 +04:00
Razharas
ea54257ab6 Ported cable coils to stacks crudely
Yeah
2014-01-22 02:11:19 +04:00
JJRcop
36ec9cbb6b Nuke toy no longer uses process and instead uses sleep
I don't know what I was thinking with the process, oh well!
2014-01-21 16:52:10 -05:00
JJRcop
0e45022798 Resolved more conflicts with drying rack before being pulled
Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi
2014-01-21 13:01:53 -05:00
Robson Richards
1ff14a5fcf Adds item_heal_robotic() - a way for items to trigger robotic limb heal procs without copy-paste 2014-01-21 07:38:46 +00:00
Ergovisavi
c1fa50976b Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium 2014-01-20 17:48:38 -08:00
JJRcop
a52678531c Nuke toy tweaks
Made the cooldown noticable
Shortened cooldown to 3 minutes
2014-01-20 15:38:06 -05:00
fleure
ad49512b4e Merge pull request #2440 from Petethegoat/suicideformat
Updated all suicide_act()s to use a new span class, 'suicide'.
2014-01-20 11:11:23 -08:00
fleure
d6964e703d Merge pull request #2442 from Alek2ander/master
Logs, logs everywhere
2014-01-20 11:08:57 -08:00
Cheridan
70e5618cb0 Merge pull request #2375 from Giacom/remove_icon_operations_from_premises
[501] Refactored the code to remove most icon operations for changing an icon's colour.
2014-01-19 16:06:25 -08:00
Alek2ander
ecf50f2de8 Goodbye nuke 2014-01-19 22:15:28 +04:00
Alek2ander
9fa38637ad Logs everywhere
Explosion game log now has epicenter coords
Powersink placement and explosion notifications
C4 notifications and logs
Logging singulo munchies and death
All SMES interactions now logged, because any of them can mess stuff up
Telesci logs what was teleported
2014-01-19 21:16:30 +04:00
Pete Goodfellow
af4849ce72 Updated all suicide_act()s to use a new span class, 'suicide'. 2014-01-19 16:46:37 +00:00
fleure
cd5fb384f0 Merge pull request #2409 from Rolan7/Issue112_Powersinks
Fixes Issue 112, APCs not charging
2014-01-18 17:30:02 -08:00
fleure
4efa6b3114 Merge pull request #2412 from Razharas/BorgAndGhostClickDragInventory
Fixes borgs and ghosts storages
2014-01-18 17:29:44 -08:00
Balrog
fe8dba3dc1 Refactored card code to remove copypasted variable assignment. Card objects are now children of /obj/item/toy/cards. 2014-01-18 20:14:21 -05:00
Hornygranny
01ce0f5392 Removed copypaste for cyborg metal sheets
Fixed typos
2014-01-17 15:45:09 -08:00
fleure
d6937897f1 Merge pull request #2399 from Glloyd/master
Fixes the back icons for the scythe and the Roman shield.
2014-01-17 15:23:57 -08:00
Razharas
0dcb8a8042 Fixes borgs and ghosts storages
Fixes #2084
2014-01-18 03:23:02 +04:00
Rolan7
f5267c22db Fixes Issue 112 which was due to powersinks draining cells without telling the APC, resulting in the APC believing itself to be full. 2014-01-17 17:21:38 -05:00