Commit Graph

14295 Commits

Author SHA1 Message Date
Remie Richards af1922ac57 Merge pull request #13128 from Anonus/jauntblob
Adjusts blob ability costs down slightly, gives blobs a hud
2015-11-21 22:38:03 +00:00
MMMiracles db84542278 Merge branch 'master' of https://github.com/tgstation/-tg-station into spookycaves 2015-11-21 14:33:45 -05:00
Firecage c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
KorPhaeron 888fe9fb30 Default 2015-11-21 06:43:01 -06:00
octareenroon91 e2a27fb018 Add Carbon Dioxide. 2015-11-21 06:20:16 -06:00
Kyle Spier-Swenson 226c92bbca Fixes readmin not working with keys 2015-11-20 21:11:26 -08:00
Nerd Lord f458c2cead The blob eats nondense things in all cases.
Probably fixes one or two bugs in the process.
2015-11-20 21:03:43 -05:00
Nerd Lord 4ed2730155 TODO: rewrite all of event code so you can check if the event can run in the first place. 2015-11-20 20:02:08 -05:00
Nerd Lord 00e7cf9836 Fixes #11442 and tweaks the icon update to use WIZARDRY
Also fixes the event possibly using up all chances to occur if there are too few dead mobs.
2015-11-20 19:51:34 -05:00
Cheridan 7595a4b728 Merge pull request #13125 from phil235/NoDoubleChemHandling
Fixes human having two handle_chemicals_in_body() procs.
2015-11-20 17:29:12 -06:00
Cheridan a88503cfca Merge pull request #13115 from bgobandit/dronedetox
Drones no longer receive toxin damage.
2015-11-20 17:06:03 -06:00
Cheridan f2988045da Merge pull request #13036 from AnturK/fixx
Some visibility fixes
2015-11-20 17:04:05 -06:00
Nerd Lord b163bce082 Adds blob help! Blobs can now check what stuff does with a help verb! Help, it's eating me!
Blobs now get to know what their chemical does.
Added two more buttons, for readapt chemical and storage blob.
Added hotkey for removing blobs, alt-click.
Removing a blob gives you some points back.
2015-11-20 17:00:43 -05:00
Remie Richards be674253ee Synths can now ingest Synthflesh to rebuild their disguise AND heal them. Moves "Op" stuff to a /synth/military subspecies. 2015-11-20 15:54:36 +00:00
Cheridan 3aa76f80e9 Merge pull request #13080 from PKPenguin321/patch-4
HoG fountains now give an omnizine-like reagent instead of Doctor's Delight + Typo Fix
2015-11-19 22:43:12 -06:00
octareenroon91 1d8dd9a3e0 Spill Oxygen / Obtain Atmosphere
Give oxygen and nitrogen reaction_obj and reaction_turf functions, which produce their respective gases.
2015-11-19 22:22:47 -06:00
Razharas 52ce383102 Merge pull request #13053 from AnturK/doors
Makes staff of doors create random mineral doors.
2015-11-20 06:54:28 +03:00
Cheridan 2ebbeef108 Merge pull request #13108 from Incoming5643/I_didnt_even_have_to_touch_savefiles_to_break_them_this_time
Fixes species selection not saving properly between rounds
2015-11-19 21:30:28 -06:00
Cheridan e9b0e5a148 Merge pull request #13095 from kingofkosmos/grabclickupgrade
Upgrade grab by clicking on grabbed mob
2015-11-19 20:56:55 -06:00
Cheridan 83f38f56ab Merge pull request #13103 from tkdrg/igotcrabs
Fixes living mobs being pulled to brains or slugs
2015-11-19 19:54:06 -06:00
phil235 c1410d15f8 Fixes human having two handle_chemicals_in_body() procs. 2015-11-20 00:21:53 +01:00
Cheridan 4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof
Adds subtypesof(path)
2015-11-19 16:31:09 -06:00
Remie Richards 2c4676757c Adds a Synth Species, Admin only atm, Imitates a species and when they reach 50 HP their skin partially falls off. Adds a method for species to react to being force set by an admin. 2015-11-19 22:05:48 +00:00
Cheridan 8994f03377 Merge pull request #13100 from KorPhaeron/harvester
Harvesters made by nar-sie are no longer made cultists (again)
2015-11-19 15:21:44 -06:00
Remie Richards 0710ce5def Merge pull request #13070 from octareenroon91/patch-30
Introduce the four-color pen
2015-11-19 18:42:26 +00:00
bgobandit 89316bf527 Drones no longer receive toxin damage. 2015-11-19 11:33:40 -05:00
Tkdrg db7177ae66 Fixes living mobs being pulled to brains or slugs
Fixes #13069
2015-11-19 00:44:35 -03:00
Incoming cb5401467d Species selection wasn't saving properly. Why? Because species_list used id as a reference, but roundstart_species used name.
THESE AREN'T THE SAME THINGS.

Both lists now use id, and savefiles will properly look for/save said ids
2015-11-18 22:29:20 -05:00
bgobandit 2fd13edef2 Adds hivelord stabilizer. Fixes a bug. 2015-11-18 22:04:01 -05:00
as334 d97dffaf57 unfucking shit ass plasma memes part 3 2015-11-18 20:58:05 -05:00
bgobandit 899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
2015-11-18 19:55:06 -05:00
bgobandit b928b8ec18 fixes memestation, ups ore points slightly 2015-11-18 19:51:49 -05:00
bgobandit bb397fcc0d fixes bluespace crystal related bug 2015-11-18 19:32:20 -05:00
bgobandit 47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
octareenroon91 c183c660fc Typo in four-color pen feedback
Change message starting, "pen will now write..."
Now it starts grammatically correct: "The pen will now..."
2015-11-18 16:36:42 -06:00
KorPhaeron a6b286838e Harvester 2015-11-18 15:43:22 -06:00
Remie Richards 7333bede43 Merge pull request #13055 from Anonus/actionbuttons
Gives constructs action buttons, adds cool effects to cult turfs.
2015-11-18 20:26:47 +00:00
kingofkosmos 6f324ca20a Enables upgrading a grab by clicking the grabbed mob again. Alters the grab-messages a bit. 2015-11-18 20:30:36 +02:00
Cheridan 3b9bf12983 Update mob.dm
Readds comment
2015-11-18 01:48:45 -06:00
Cheridan cba8a9a325 Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix
Conflicts:
	code/modules/mob/mob.dm
2015-11-18 01:44:29 -06:00
kingofkosmos 50b55e54e8 Removes checks for seclite/hydrid taser + suppressor/gun to be in hands for combining them. 2015-11-18 06:24:23 +02:00
oranges 6672cb0f5d Synthflesh now correctly heals instead of kills
As funny as that what, it's not the intent, which was instead a slight nerf to synthflesh.
2015-11-18 16:39:05 +13:00
PKPenguin321 3d2bf3ae7b adds godblood, child of omnizine
is identical to omnizine except that it has a 7.5x higher overdose threshold and has a new name/desc.
2015-11-17 18:10:16 -08:00
as334 c98a7a0d7e Fixes merge conflicts, also a minor slipup with flags 2015-11-17 20:59:43 -05:00
as334 160506b401 Unfucking shit ass plasma memes part 2 2015-11-17 20:38:56 -05:00
octareenroon91 5b429cf2fe remove commented-out code from pen.dm
fine
2015-11-17 18:43:40 -06:00
Incoming b12fc38946 A number of mixed nerfs and buffs to stunning spells:
Lightning Bolt:
*You can no longer throw the bolt whenever you want, it will fire itself once it's done charging. Fixes #12849
*Getting hit by a bolt will do a flat 30 burn now, as opposed to scaling with how long you spent charging the spell. Unless you made a habit of charging lightning bolt to near maximum every time you cast it this is a buff.
*Every time the bolt jumps the next shock will do five less burn damage.
*Lightning bolts can still jump back to the same body, so the maximum number of bolts you can be hit by in a single casting is three, and the maximum amount of damage you could take for that is 60 burn.
*Stun time is unaffected

Magic Missile:
*Cooldown raised to 20 seconds, up from 15
*Cooldown reduction from taking the spell multiple times raised from 1.5 seconds to 3.5 seconds. Rank 5 magic missile now has a cooldown of 6 seconds, down from 9, and is effectively a permastun.

Time Stop:
*Time Stop field now persists for 10 seconds, up from 9
*Cooldown raised to 50 seconds, up from 40
*Cooldown reduction from taking the spell multiple times raised from  7.75 seconds to 10 seconds. Rank 5 time stop now has a cooldown of 10 seconds, up from 9, and is effectively a permastun.
2015-11-17 19:04:38 -05:00
octareenroon91 33350bffe6 Four-color pen code improvement.
Take advantage of inheritance; use defaults instead of New()
2015-11-17 13:07:22 -06:00
Razharas 3978e087ec Merge pull request #13040 from MrStonedOne/patch-63
Makes external archive only show pages of 250 books
2015-11-17 20:21:45 +03:00
Nerd Lord a183e0474d Pooling is good for the soul. 2015-11-17 11:27:26 -05:00