Commit Graph

28571 Commits

Author SHA1 Message Date
Joan Lung
971df0d8de info 2016-06-20 10:36:01 -04:00
Joan Lung
901b9b2549 Scarab proselytizers reap more alloy from metal and plasteel and can now reap alloy from rods directly 2016-06-20 10:32:17 -04:00
Joan Lung
20860f2d6a Merge pull request #18646 from Cruix/languages_split
Splits languages into languages_spoken and languages_understood.
2016-06-19 15:23:38 -04:00
unknown
f052ce679b Fixed compile error 2016-06-19 15:13:16 -04:00
unknown
4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00
coiax
961a6c4c26 Adds potted plants to cargo packs (#18662)
🆑 coiax
rscadd: Potted plants can now be ordered from cargo.
/🆑
2016-06-19 14:05:18 -05:00
Cheridan
944b695ec3 Merge pull request #18660 from coiax/fix-17560
All living mobs can now attempt to pick up cards
2016-06-19 13:37:59 -05:00
Joan Lung
5019342bf1 Clockwork power drain will update APCs (#18707) 2016-06-19 13:35:11 -05:00
Joan Lung
28fe7a29aa Invoking Nzcrentr causes slightly more damage (#18705) 2016-06-19 13:34:19 -05:00
Cheridan
ef78429058 Merge pull request #18694 from ChangelingRain/lesscomponents
Slows down clockwork component generation slightly
2016-06-19 13:32:58 -05:00
Cheridan
2464e3a664 Merge pull request #18692 from ChangelingRain/fastcastblast
If Ratvar is alive or the slab has no cost, invoke time is halved
2016-06-19 13:04:02 -05:00
Cheridan
3cd3d9d476 Merge pull request #18715 from xxalpha/ifixallthefloors
Repathed z5.dmm's asteroid platings, added warning floors, clean up.
2016-06-19 12:52:51 -05:00
Cheridan
06d8cf8491 Merge pull request #18718 from AnturK/buncha_fixes
Minor fixes
2016-06-19 12:31:58 -05:00
Joan Lung
05d915b0bb Tweaks clockwork structure health (#18696) 2016-06-19 18:12:17 +02:00
Joan Lung
e35a00cd31 Invoking Nezbere is less effective on Ocular Wardens (#18695) 2016-06-19 18:11:51 +02:00
Joan Lung
071f1cccd0 Invoking Sevtug is now a global hallucination effect instead of mind control (#18689)
* Invoking Sevtug is now a global hallucination effect instead of mind control

* sound

* kek

* //

* sevtug no

* halve after calculation

* '-

* girl check your values

* clang
2016-06-19 17:51:05 +02:00
Joan Lung
b941a47a60 Adds cogscarabs to clock cult (#18685)
* Adds cogscarabs to clock cult

* playstyle string

* info

* oh good going

* no static

* delay it eating all the metal

* scarab removal service

* cog

* ree

* error handling

* todo: languages = RATVAR

* isclockmob

* very large box

* faintly glowing eyes
2016-06-19 17:26:35 +02:00
Joan Lung
243bfb4d78 Merge pull request #18708 from sawu-tg/master
Pope of Sin fixes and changes
2016-06-19 09:55:41 -04:00
AnturK
1e51270078 Use RANGE_TURFS 2016-06-19 14:38:08 +02:00
WJohn
55428bb8ad Merge pull request #18593 from pudl/cool-carpet
Re-implements old carpet sprite
2016-06-19 08:20:02 -04:00
Sawu
617e895a9c Pope Fixes
* Pope should now appropriately not move during cutscene events.
* Pope now uses spiral_range_turfs instead of a subtracted range.
* Pope will no long flee-spam.
* Pope will appropriately manage his acolytes in all states now.
* Pope's rage timer values adjusted for previously changed rage timers.
* Pope will now teleport to a generic event marker in the chapel for his flee, failing to find one will result in him healing on the spot.
* Acolytes no longer use del_on_death and Pope will appropriately respond to their demise.
2016-06-19 12:59:45 +10:00
Sawu
ac72a696b0 Pope fixes
* Two generic spawn chains have been modified to use addtimer()
2016-06-19 11:23:48 +10:00
Sawu
70d79a627f Pope fixes
* Pope teleport effect is now properly an /obj/effect and uses PoolOrNew()
2016-06-19 10:19:58 +10:00
Sawu
06206cd99d Pope Fixes
* Teleport effect is now /overlay/temp
* Pope's teleport now uses forceMove
2016-06-19 09:30:52 +10:00
Sawu
c57fb1277f Fixes to Pope
* Now correctly pools his sinShed effects.
* Pope's teleport effect is now it's own subtype.
* Removed some superfluous var setting.
2016-06-19 08:54:58 +10:00
xxalpha
a15853d43f FUCK
FFFUCK
2016-06-18 22:16:46 +01:00
Xhuis
28eaf1174a Fixes a gamebreaking umbra possession bug 2016-06-18 15:23:35 -04:00
AnturK
48df887fad Fixes #17701 2016-06-18 19:22:59 +02:00
xxalpha
8c4fcec9d0 Merge remote-tracking branch 'upstream/master' into ifixallthefloors 2016-06-18 17:59:09 +01:00
xxalpha
db9f73ee07 Repathed z5.dmm's asteroid platings, added warning floors, clean up. 2016-06-18 17:45:41 +01:00
Cheridan
9c59db6cd0 Merge pull request #18659 from MrStonedOne/patch-217
fixes ghost vv.
2016-06-18 11:30:48 -05:00
unknown
b12398e9fc Resolved conflicts. 2016-06-18 12:17:00 -04:00
Cheridan
4e4f394a60 Merge pull request #18674 from tgstation/RemieRichards-わたしのなまえはレミエです
Fixes Anime Names
2016-06-18 11:14:31 -05:00
duncathan salt
b4b307a733 Merge pull request #18673 from ChangelingRain/droneconvert
Drones don't get hacked by ratvar conversion unless they're actually converted
2016-06-18 10:10:49 -06:00
Cheridan
caf6352581 Merge pull request #18675 from coiax/plz-no-i-have-a-drone-family
Drones have the silicon faction by default
2016-06-18 11:09:32 -05:00
Cheridan
6031ce1bab Merge pull request #18676 from Xhuis/cherry_bombs_again_kappa
Ambrosia gaia balancing
2016-06-18 11:02:59 -05:00
Sawu
51117a4f5d Pope of Sin fixes and changes
* Pope is now a hostile NPC, instead of neutral. He will attack nearby people in between judging.
* Pope now has a death sprite, as well as a death "scene".
* Pope health buffed to 1000
* Pope damage is now correctly 15-20 instead of 75-85
* Pope now has 3 stages, which are cycled through during his lifetime.
* Pope now spawns as "Hades, [title]".
* Pope visible_message font sizes adjusted to be less intrusive.
* Added an in and out effect for Pope's teleport.
* Pope now has a 40% chance to bring people to him.
* Pope now a-pope-riately ignores environment/temperature damage.
* Pope now recognizes more attack types.
* Pope will now deflect non-point blank bullets.
* Pope's sin timer now scales with his base sin value, allowing admins to scale his speed globally, with one var (sinPersonTime)
* Attacking the Pope now raises his Rage level, which will trigger changes in his combat at certain levels.
* Pope no longer responds to every hit, now nerfed to a 20% per hit.
* Pope will now retreat to the Chapel upon losing a certain amount of health, restoring his health. He can do this infinite times, but with diminishing returns.
* Almost all instances of Pope teleporting to nullspace have been fixed.
* Almost all instances of Pope addressing the wrong target have been fixed.
* Almost all instances of Pope runtiming on a ckey-less target have been fixed.
* Punished Greed no longer turns the target into a statue, but instead a cockroach with mind-swap
* Indulged Sloth grants 1000 ticks of drowsyness.
* Indulged Wrath now turns the target into a slaughter demon.
* Pope is now appropriately immune to his own timestop.
* Punished Lust Stones no longer instantly kill the target, instead slowly giving them a heart attack, or giving them a small amount of healing, depending on their proximity from another player.
* Pope can now manage and summon his Acolytes, who will assist him in battle at certain rage levels.
* Other various minor fixes and tweaks to Pope's behavior in general.
2016-06-19 00:12:45 +10:00
oranges
eaa85a4931 Merge pull request #17069 from MrStonedOne/XKeyscore
Automatic Proxy Detection
2016-06-19 01:17:59 +12:00
AnturK
f14b81fdfd Fixes #18271 2016-06-18 15:02:32 +02:00
pudl
1e2cb6e93e smooth false 2016-06-18 07:55:57 -05:00
Joan Lung
d91812d3ad Clock cult scripture unlock now counts humans and silicons only (#18669)
* Clock cult scripture unlock now requires non-brain mobs

* switch

* brains don't count dave

* humies and silicons only

* i blame everything on how inattentive i am
2016-06-18 21:15:12 +10:00
Jordie
08e8f26565 Merge pull request #18666 from ChangelingRain/inathnecking
Fixes invoking Inath-Neq permanently coloring people
2016-06-18 21:00:53 +10:00
AnturK
7237a3effc Fixes #18035 2016-06-18 12:42:13 +02:00
Jordie
47c184bd41 Merge pull request #18656 from Niknakflak/MewMew
Adds the catghost to donator's special ghosts
2016-06-18 19:53:47 +10:00
pudl
e4bbcd82dc done 2016-06-18 03:08:14 -05:00
oranges
24eb2c81ac Merge pull request #18690 from KorPhaeron/fulton_patch
[s]Missing return added to fultons
2016-06-18 14:43:12 +12:00
Joan Lung
97762ed304 oh come on, curse my inattentive coding 2016-06-17 22:03:24 -04:00
Joan Lung
0922eaefe7 very smart, lady, very smart. 2016-06-17 22:02:50 -04:00
Joan Lung
6291a27d0d Slows down clockwork component generation slightly 2016-06-17 21:59:17 -04:00
Joan Lung
e6f23be4b6 If Ratvar is alive or the slab has no cost, invoke time is halved 2016-06-17 21:27:09 -04:00