Commit Graph

13942 Commits

Author SHA1 Message Date
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1
Fixes mob revival
2016-02-17 20:42:10 -06:00
Cheridan
a2ef1ad26f Merge pull request #15545 from Shadowlight213/defenderpref
Makes wizard academy defender respect prefs
2016-02-17 19:57:02 -06:00
Cheridan
6290022001 Merge pull request #15547 from KorPhaeron/seed_vault
Five lavaland ruins
2016-02-17 19:54:08 -06:00
tkdrg
2934e6c8b7 Merge pull request #15165 from xxalpha/urange
ultra range again
2016-02-17 21:32:38 -03:00
tkdrg
2b96cbbdce Merge pull request #15574 from KazeEspada/Bagfixes
Bag tweaks.
2016-02-17 21:29:05 -03:00
duncathan salt
b8946d608e Merge pull request #15480 from bgobandit/kitty
Cats now display a variety of catlike behaviors!
2016-02-17 17:07:05 -06:00
AnturK
3c8652e346 Merge pull request #15504 from phil235/HatMaskFacialHairFixes
Fixes mask and head gear issues
2016-02-17 21:47:17 +01:00
phil235
54b87e0239 Fixes typo in suit.dmi
Removes action button from the paranormal response unit helmet
2016-02-17 21:32:46 +01:00
Cheridan
9c4d90c72c Merge pull request #15564 from Incoming5643/ape_escape
Pun Pun has gained a few persistence save file features
2016-02-17 12:42:37 -06:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
KorPhaeron
f3fd49349c Prisoner Transport 2016-02-17 06:32:32 -06:00
phil235
2dd476f13e Fixes shaking someone resting not making them stand up.
Fixes shaking someone not reducing the sleeping var if the mob asleep is buckled to stand up.
Fixes merge conflict issues.
Fixes my revive code leaving the revived AI blind.
2016-02-17 01:23:36 +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
KazeEspada
5d8d5854f9 Bag tweaks.
Department Backpacks are now the default(instead of grey backpacks).

Fixed an error on humans where new humans would have an integer for their backpack.

This will not affect current preferences.
2016-02-16 14:03:35 -07:00
Cheridan
073817b0ba Merge pull request #15538 from phil235/SpawnAtomFix
Fixes spawn_atom() runtime.
2016-02-16 03:51:12 -06:00
Incoming
f61707c6f9 Pun Pun has gained a few persistence save file features
Whatever Pun Pun is wearing on his/her head and face at round end will still be there at the start of the next round. Back and hands do not save for obvious balance reasons.
If Pun Pun dies but leaves an intact corpses his/her successor will be named Pun Pun II and inherit the items his corpse was wearing at the end of the round.
If Pun Pun gets gibbed the chain of monkeys is broken and the next round monkey will be a new progenitor with a potentially different name. Obviously their items won't be saved in this case.
2016-02-15 21:20:29 -05:00
AnturK
7ede85391f Merge pull request #15527 from phil235/ReviveFixes
Fixes blindness overlay after reviving.
2016-02-15 23:17:55 +01:00
oranges
b496ca6043 Don't allow every single spider to be player controllable 2016-02-16 10:00:23 +13:00
KorPhaeron
d14a7f2470 Another map 2016-02-15 13:45:16 -06:00
tkdrg
10abc21c2c Merge pull request #15525 from AnturK/reliable_fix
Basic reliability fix
2016-02-15 16:44:58 -03:00
KorPhaeron
9cec5f51a2 Merge pull request #15546 from octareenroon91/patch-31
Correct generic chem patch icon
2016-02-15 05:23:46 -06:00
KorPhaeron
0e6a7b77c8 Seed Vault 2016-02-15 04:06:40 -06:00
octareenroon91
e51d602ca6 Correct generic chem patch icon
Fixes #15540
2016-02-15 01:15:37 -06:00
Shadowlight213
b46b11d75d Makes wizard academy defender respect prefs 2016-02-14 23:03:22 -08:00
tkdrg
a2d61685bb Merge pull request #15508 from PKPenguin321/patch-13
Lowers cost of traitor surgery bag
2016-02-14 23:21:52 -03:00
Incoming
57c9c08bef Merge branch 'master' of https://github.com/tgstation/-tg-station into I_dont_know_why_Im_doing_this_but_its_not_your_job_to_stop_me
# Conflicts:
#	code/modules/mob/living/simple_animal/parrot.dm
2016-02-14 17:57:03 -05:00
phil235
4aca9a1529 Fixes spawn_atom() runtime. 2016-02-14 23:49:25 +01:00
Incoming5643
4d199e699d adds speech_shuffle_rate as a var
speech_shuffle_rate will also raise when poly is fed a cracker to help cut down on line repetition
2016-02-14 17:46:15 -05:00
tkdrg
9e74538509 Merge pull request #15490 from octareenroon91/patch-37
Parrot-Cracker Balance
2016-02-14 19:41:31 -03:00
Incoming5643
431421b2f2 Take cares of minor suggested code tweaks 2016-02-14 17:17:41 -05:00
octareenroon91
610f2b47ba Now requires 20 crackers to go from 1% to 100% speak_chance. 2016-02-14 15:34:07 -06:00
tkdrg
449c20ec74 Merge pull request #15497 from AnturK/scrub
Fixes scrubbers/vents showing pipes over flooring
2016-02-14 17:13:05 -03:00
tkdrg
c26de00dae Merge pull request #15499 from neersighted/readmin
Fix and refactor deadmin/readmin
2016-02-14 17:08:13 -03:00
phil235
961331d00a Fixes ethereal jaunt not updating your perspective at the end. 2016-02-14 19:29:34 +01:00
AnturK
46597f41f6 Bit more flat 2016-02-14 17:39:44 +01: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
tkdrg
911e1b2b21 Merge pull request #15496 from phil235/FinalBorgStunFix
Fixes runtime when borg try to reduce its weakened var.
2016-02-14 12:50:05 -03:00
phil235
ff371a5ea3 Let's not remove the mob from dead mob list if we're not actually reviving them. woops 2016-02-14 15:32:22 +01: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
AnturK
3ec50ed2cf Simple reliability fix 2016-02-14 12:12:36 +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
Kyle Spier-Swenson
efde9a7e3b compile error fix 2016-02-13 22:41:17 -08:00
Kyle Spier-Swenson
cd9c7e9b6f Update LINDA_turf_tile.dm 2016-02-13 22:41:16 -08:00
Kyle Spier-Swenson
15e080bc07 Makes atmos treat atmos_adjacent_turfs as a list 2016-02-13 22:41:16 -08:00
Kyle Spier-Swenson
889304239e Speed up process_cell() by caching the nearby turfs rather then do a lookup each loop. 2016-02-13 22:41:15 -08:00
Kyle Spier-Swenson
50d276711a Update components_base.dm 2016-02-13 22:23:31 -08:00
Kyle Spier-Swenson
202e6e1fe7 Partial revert of 14756 (Pipes don't transport air across time and space) 2016-02-13 22:22:19 -08:00
Cheridan
7d93b7d6c4 Merge pull request #15386 from Zerrien/master
Adds unique icons for the 2 types of patches.
2016-02-13 23:36:04 -06:00