Commit Graph

13651 Commits

Author SHA1 Message Date
KorPhaeron
1bfd3eae34 Better inhands 2016-02-22 16:36:47 -06:00
KorPhaeron
20e9b2a8e2 Fixes control wand access 2016-02-22 16:32:38 -06:00
KorPhaeron
d217b48ab3 Config does not work for spawning things in lockers 2016-02-22 15:42:07 -06:00
KorPhaeron
b278741b19 Door remote config 2016-02-22 14:58:05 -06:00
KorPhaeron
537ac55162 Removes excess whitespace 2016-02-18 02:37:48 -06:00
KorPhaeron
d6e6874206 Control Wand 2016-02-18 02:34:20 -06:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1
Fixes mob revival
2016-02-17 20:42:10 -06:00
Cheridan
a66e40eb9a Merge pull request #15558 from Incoming5643/pisssh
Restores the old sound of windowed doors
2016-02-17 19:50:29 -06:00
Cheridan
bb00bd311f Merge pull request #15513 from KorPhaeron/chaplain3
Four more holy weapons
2016-02-17 19:48:06 -06:00
tkdrg
2934e6c8b7 Merge pull request #15165 from xxalpha/urange
ultra range again
2016-02-17 21:32:38 -03:00
tkdrg
0b888afc41 Merge pull request #15572 from KorPhaeron/gland
Adds missing punctuation to alien mindshock
2016-02-17 21:22:58 -03:00
AnturK
3c8652e346 Merge pull request #15504 from phil235/HatMaskFacialHairFixes
Fixes mask and head gear issues
2016-02-17 21:47:17 +01:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
AnturK
ea2f57e6d2 Merge pull request #15523 from optimumtact/extreme_makeover_turret_edition
Rearrange turret files to split out functionality
2016-02-17 11:34:02 +01:00
phil235
5db3ab47c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1
Conflicts:
	code/game/machinery/computer/aifixer.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-02-17 00:33:26 +01:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily:
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
Cheridan
c1a1e90ca7 Merge pull request #15536 from optimumtact/spidersspiderseverywhere
Don't allow every single spider to be player controllable
2016-02-16 15:47:15 -06:00
Cheridan
aa8de1bb51 Merge pull request #15554 from Menshin/autolathe_stacks_fix
Fix autolathe merging on top stacks without checking for types
2016-02-16 13:22:23 -06:00
KorPhaeron
8f776c2cd8 Missing punctuation 2016-02-16 11:34:51 -06:00
AnturK
7ede85391f Merge pull request #15527 from phil235/ReviveFixes
Fixes blindness overlay after reviving.
2016-02-15 23:17:55 +01:00
Incoming
9e2f72bd8c Makes the vanilla white windowed doors (the fulltile ones) sound like other doors again as opposed to sounding like windoors (the tile boarder ones).
I'll take "Things everyone wanted to do but inexplicably didn't" for 400, Alex.
2016-02-15 17:01:12 -05:00
oranges
f2d4a60c74 Fix a lot of issues as pointed out by review
Update the defines to be the correct syntax
2016-02-16 10:50:38 +13:00
oranges
913d46f32d Remove old workaround check
This looks to be a check from before nodrop functionality to prevent robots using their gun on the turret
2016-02-16 10:05:32 +13:00
oranges
0dd89d484a Rearrange turret files to split out functionality
Add defines for the turret construction phases

Tweak syndicate turret targeting to remove uncessary faction check
2016-02-16 10:05:32 +13:00
oranges
b496ca6043 Don't allow every single spider to be player controllable 2016-02-16 10:00:23 +13:00
Menshin
8b5ffe4779 Fix autolathe merging stacks without checking for types. 2016-02-15 20:44:28 +01:00
tkdrg
2a4a5a42f4 Merge pull request #15522 from optimumtact/unholyspawns
Refactor out a spawn in turret code
2016-02-15 16:39:49 -03:00
oranges
f5812bbd47 Refactor out a spawn in turret code
Also avoids checking the emagged var twice when shooting a projectile
2016-02-15 23:25:02 +13:00
KorPhaeron
fbc55d391a Removes silly references 2016-02-15 04:14:27 -06:00
Remie Richards
e8426a26da Merge pull request #15505 from ChangelingRain/sleeplesscarp
Sleeping carp gang no longer has special equipment
2016-02-15 03:05:04 +00:00
tkdrg
f2fc954846 Merge pull request #15511 from francinum/patch-2
Normalized capitalization.
2016-02-14 23:14:16 -03:00
duncathan salt
be3b993465 Merge pull request #15218 from MrStonedOne/patch-144
[ready]Speed up process_cell() by caching atmos_adjacent_turfs as a list of nearby turfs and not a bitflag so we can avoid doing a bunch of turf lookups 4 times for each turf in atmos
2016-02-14 10:34:02 -06:00
phil235
e3bbcb0f7f Fixes revive() not properly removing the blind overlay. (fixes staff of healing)
Fixes revive() working on brainless carbons, making them die right away. It now only heals the body but doesn't actually make the mob alive again.
Fixes dead mob put into closet and then revived not seeing the closet vision overlay.
Fixes brain mob's emp_damage never decreasing when stat == DEAD.
Fixes posibrain's brainmob starting dead.
Fixes ai fixing not clearing the blind overlay properly.
Fireball projectile no longer explodes on the firer when there's a body on their tile. The fireball's range() code now only checks the two tiles on its front left and front right for mobs to hit.
Remove some update_vision_overlays() (now unused) that I forgot to remove.
Using a staff oh healing on a corpse with a damaged brain organ will revive the mob and heal the brain organ.
2016-02-14 15:26:46 +01:00
MrStonedOne
a2ae265064 Brings the rest of atmos into the new turf list system (and some more speed ups for process_cell()) 2016-02-14 00:07:43 -08:00
francinum
854f0e3171 Fixes the rest in BuildAndRepair 2016-02-14 02:12:43 -05:00
oranges
1653df9e51 Make sure function is defined before overriding it 2016-02-14 19:43:52 +13:00
oranges
4058f268e1 Fix how AI turrets assess human perps
Now it matches how the old logic worked

Probably also takes care of how heavy turrets are at the moment.
2016-02-14 19:39:29 +13:00
KorPhaeron
e6dbea2184 More holy weapons 2016-02-13 21:42:36 -06:00
francinum
09daed57b8 Normalized capitalization.
circuit Board (Exosuit Control Console)
circuit board (Exosuit Control Console)
2016-02-13 21:37:53 -05:00
Cheridan
5f089e6ac1 Merge pull request #15483 from ChangelingRain/blobtweaking
Blobs can now expand onto lattices and catwalks
2016-02-13 19:58:09 -06:00
tkdrg
321eb48769 Merge pull request #15481 from phil235/FixMalfCameraNightvision
Fixes Malfpowwer upgrade camera net not giving the AI nightvision
2016-02-13 22:14:13 -03:00
tkdrg
704c00aafe Merge pull request #15479 from AnturK/lathe_fix
Fixes autolathe search
2016-02-13 22:11:22 -03:00
phil235
5a96cf86ad Merge branch 'master' of https://github.com/tgstation/-tg-station into HatMaskFacialHairFixes
Conflicts:
	icons/mob/suit.dmi
2016-02-14 00:22:53 +01:00
Nerd Lord
7c183d448e Sleeping carp gang no longer has special interactions. 2016-02-13 18:17:01 -05:00
phil235
fd16e02cdb Fixes most (non hardsuit) helmets hiding the glasses when they shouldn't.
Fixes not seeing glasses through the riot helmet.
Fixes gas mask protruding from the abductor helmet.
Fixed radiation hood not hiding your hair, earpiece, mask.
Fixes colored justice hats not having an on-mob icon_stat.
Removed BLOCKHAIR bit from var/flags , moved it to flags_inv and renamed to HIDEHAIR
Added HIDEFACIALHAIR bitflag so certain hat/helmet can show just the beard.
Fixed human/update_inv_glasses not checking if our mask hides our glasses.
Fixed check_obscured_slots() not checking if our masj obscur our glasses.
Fixes some bits of flags_inv having the same value.
Fixes crusader hood and other headgear not hiding your identity when they should.
Fixes drone mask icon not appearing.
2016-02-14 00:03:07 +01:00
Nerd Lord
ea67e1aa0d Blobbernauts can now speak to other blobbernauts and overminds with :b
Blobbernauts and blob spores now have ask, exclaim, and yell speak emotes.
Blobbernauts and blob spores have a randomly-generated number assigned to their names.
2016-02-13 16:47:25 -05:00
tkdrg
c52a3e88d4 Merge pull request #15447 from KorPhaeron/holy_weapons
Three more chaplain weapons
2016-02-13 17:29:47 -03:00
tkdrg
a144f70319 Merge pull request #15476 from phil235/ClonePodEjectFix
Fixes clonee in crit not falling down when ejected from the cloning pod.
2016-02-13 17:25:22 -03:00
tkdrg
e7af997785 Merge pull request #15441 from phil235/BrainChanges
Brain fixes and changes
2016-02-13 13:29:37 -03:00
tkdrg
be59d324b3 Merge pull request #15448 from Shadowlight213/wouldyouliketoplayasshadewouldyouliketoplayasshade
Makes shade ghost poll respect prefs and cultist bans
2016-02-13 13:27:53 -03:00