Commit Graph

1073 Commits

Author SHA1 Message Date
Razharas
a589387ccf Fixing merge conflicts
THis is getting harder and harder
2014-02-06 22:26:16 +04:00
Razharas
2ac38e0706 Merge pull request #2557 from Tenebrosity/awaycorpsespawnerfix
Fixes away map dead slime and AI spawners
2014-02-03 23:05:25 -08:00
Razharas
6a53a9888a Merge pull request #2545 from Cheridan/objectives
Objective Refactor
2014-02-03 22:27:26 -08:00
fleure
a854a41994 Merge pull request #2540 from Incoming5643/blobjob
BE_BLOB and easy adminblobing
2014-02-03 10:34:31 -08:00
Cheridan
ad235cf18f Merge pull request #2563 from Razharas/NewTables
New PR for crafting tables
2014-02-03 08:46:56 -08:00
Tenebrosity
e33f91229b Gameticker checks for mind in end of game readout
This stops AI corpses showing up in the end of round report. It also
means that a ghosted (whether after death or by going catatonic) AI or
borg will now have its player shown at the end of the round.
2014-02-03 05:27:03 +13:00
Cheridan
417ccb38ea Merge pull request #2574 from Miauw62/armbladefixes
Arm blade  bugfixes
2014-02-01 18:28:16 -08: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
Miauw
ad13fc3510 Arm blades are no longer telekinetic table-breakers. Fixes an arm blade typo. Fixed #2559
Arm blades no longer delete stuff. Fixed #2570
2014-01-31 18:07:48 +01: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
Razharas
eeccd4d188 Fixes ling dna handling
Now this is all done properly
Also tiny tiny little fix of dna scanners ignoring their upgrade
2014-01-31 00:17:31 +04:00
Razharas
b0a5ae747d Added SMESes and some turbine fix
Hope it works
2014-01-30 22:21:43 +04:00
Cheridan
9f33690114 Gets rid of a couple colons. 2014-01-29 16:01:55 -06:00
Cheridan
29d17a8680 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives 2014-01-29 12:32:53 -06:00
Cheridan
6bdcf64525 Completes code changes; reimplements ninja steal objective. 2014-01-29 12:28:15 -06:00
Incoming
5c5cc6a72d Repurposes the outdated BE_MONKEY into BE_BLOB and seperates the alien and blob pools so people can prefer to be one or the other or both or neither. An annoucement should be made when this goes live so people are aware they have a new flag to set.
Adds a dedicated button on the player panel so admins can easily turn specific players into blobs.
2014-01-29 10:54:00 -05: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
fleure
bd85a001fc Merge pull request #2404 from Razharas/LingTransformFix
Ling transform fix
2014-01-26 12:34:56 -08:00
fleure
aed37f1498 Merge pull request #2425 from adrix89/Seer_change
see_invisible rework  in life
2014-01-26 10:45:26 -08:00
fleure
0b18696390 Merge pull request #2505 from Incoming5643/avastyeblobies
Blob Zombies
2014-01-26 10:18:31 -08:00
fleure
5291fa4df6 Merge pull request #2450 from Cheridan/Magic
Husking someone as a changeling will now display the victim's notes.
2014-01-26 09:44:56 -08:00
Cheridan
3a9541df96 Converts Steal objectives (except for blueprints grr) to a datum-based system. This is to support further changes to the objective system, though it does make adding new objectives nice, simple and compartmentalized. 2014-01-25 18:10:06 -06:00
Incoming
8f5bfaf872 The GiaPull™ 2014-01-25 16:47:32 -05:00
Incoming
e3e48ee9e1 Blob Zombies!
Blob spores that pass over the dead will now couple with the corpses to create blob zombies that are stronger and more resiliant than the spore alone. Should the blob zombie fall the original corpse is recovered and just as cloneable as it was before infection. These are simple animals not under the control of anyone.

Blob zombies will occur automatically if a blob finds a corpse under it and it's not already a zombie. Blob zombies have a base 80 health (normal blobs have 40) and gain additional health if the host body is wearing armor. They don't however actually gain the normal benefits of wearing the armor.

Blob zombies attack for 10 to 15 damage per strike, as opposed to the paltry 2 to 4 a hostless spore does.

Why this is good for the overmind:
The overmind cannot directly command the creation of zombies but can rally spores to a corpse's location to largely assure it will happen by itself. Blob zombies still follow rally spore commands and still count towards a factory blobs spore limit. As previously shown they're far more robust than spores and also deny the crew the ability to clone the victim until the zombie is defeated.

Why this is good for the crew:
Remember when the warden kamakazied the blob at the start of the round only to be engulfed and killed with the entire armory in his backpack? You can get those guns back now, because the warden's corpse will soon be moving to a very recoverable location! This also promotes not letting people die pointlessly to the blob or at least dragging corpses away from the blob (and hopefully to genetics) so they can't be infected.
2014-01-25 12:24:01 -05:00
Cheridan
2ff10b72f8 Standardizes and cleans up objective.dm 2014-01-23 16:33:47 -06:00
Miauw
4bdffc2dc3 Merge branch 'master' of https://github.com/tgstation/-tg-station into somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-01-22 17:01:20 +01:00
Razharas
ea54257ab6 Ported cable coils to stacks crudely
Yeah
2014-01-22 02:11:19 +04:00
Miauw
79a4f6807f LING BLADE EMERGENCY FIX PANIC 2014-01-20 20:21:39 +01:00
Miauw
168a0d4fab Improves changeling arm blades with some ALL NEW FEATURES #WHOA #WOW 2014-01-20 19:56:18 +01: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
Cheridan
74b37dc744 Husking someone as a changeling will now display the victim's notes. 2014-01-19 17:50:25 -06:00
Miauw
ed62b4d949 fixes table slicing issue 2014-01-19 18:41:49 +01:00
Miauw
13b3cd69f2 Adds changeling arm blades that can slice tables apart and break computers and generally be robust. 2014-01-19 18:33:03 +01:00
adrix89
5e7cbf0486 Fix to seer rune.
More clear comment
2014-01-19 13:40:03 +02:00
adrix89
7939e94137 Change cult see and drug checks for see_invisible 2014-01-18 15:17:15 +02:00
Cheridan
da0abda348 Merge pull request #2400 from hornygranny/summonlogging
Summon guns/magic logging
2014-01-17 23:02:46 -08:00
Razharas
fb64fda6ff Ling transform fix
Fixes #2401

The One DNA Datum was thrown into volcano
2014-01-17 20:48:57 +04:00
fleure
636f58fa6d Merge pull request #2349 from ChuckTheSheep/hijack-objective
Fixes the Hijack Objective
2014-01-17 03:42:04 -08:00
Hornygranny
c095ec359e made it actually compile 2014-01-16 17:58:42 -08:00
Hornygranny
ec92b37f4f Now includes name and ckey. 2014-01-16 17:53:21 -08:00
Hornygranny
2f05dd4b9e Adds server logging for summon guns/magic. 2014-01-16 17:51:25 -08:00
Giacomand
11bca59614 Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.
The only noticeable gameplay difference is that you can't choose your graffiti's shade.
2014-01-15 21:30:55 +00:00
ChuckTheSheep
8b55ed97f0 Fixes the Hijack Objective
The objective did not check if the owner of the objective was on the
shuttle, only if other people were.
2014-01-13 16:35:26 -05:00
VistaPOWA
0a9bc1ba13 Syndicate Borg emergency fixes
-Syndicate Borgs will no longer synch to AI
-Syndicate Borgs can no longer emag themselves
-Syndicate Borgs will get the proper faction assigned to them,
preventing viscerators from tearing them apart.
2014-01-12 23:20:57 +01:00
Giacom
6dc7736933 Merge pull request #2244 from VistaPOWA/syndieborgs
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
VistaPOWA
0afe5c982d merging upstream master into local repo 2014-01-11 17:14:48 +01:00
Aranclanos
baa86c8819 Merge pull request #2305 from Giacom/removed_set_background
Disabled the game using "set background" by making all instances of it use a define
2014-01-11 08:14:15 -08:00
VistaPOWA
671b49cba1 Fixes the double-energy draw of the esword, makes the syndicate icon properly display for the borg. 2014-01-11 17:04:17 +01:00
Giacomand
26d7a263bf Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2251 2014-01-11 14:06:36 +00:00
Giacomand
1a41abc609 The wire dialog will now properly close.
Refactored some of the code into procs.
Small feature: bombs tick louder when they are 10 seconds or less left, nuclear bombs were given the same treatment but with 20 seconds.
Fixed a bug with the syndicate bomb wire datum not using the CanUse().
2014-01-11 14:05:51 +00:00