Commit Graph

11879 Commits

Author SHA1 Message Date
Cheridan e526a4fa40 Merge pull request #13164 from MrStonedOne/patch-65
Fixes library computers thinking they already built their menu
2015-11-24 23:42:41 -06:00
Cheridan 8a595c4cb5 Merge pull request #13184 from YotaXP/char-preview
Accurate Character Setup Preview
2015-11-24 18:48:30 -06:00
Razharas 1ed275b096 Merge pull request #12719 from KorPhaeron/zombiefix
Fixes zombie infection holders
2015-11-25 02:29:47 +03:00
Razharas 41b5776893 Merge pull request #13174 from optimumtact/if_cat_parts_are_fine_then_this_is_too
Adds tarajan race to the game
2015-11-24 18:02:27 +03:00
duncathan salt 4a363b4363 Merge pull request #12910 from KorPhaeron/ghost_spawner
Ghost spawner naming fix
2015-11-23 20:02:53 -06:00
Aranclanos 0f1945bef6 Merge pull request #13051 from kingofkosmos/enableidtopdaonfloor
ID into PDA without PDA in your inventory and a few other similar things
2015-11-23 20:27:07 -03:00
Aranclanos 705ddc79d2 Merge pull request #13057 from tkdrg/fiah
Fixes the maxbodytemp of some simple_animals
2015-11-23 20:22:44 -03:00
YotaXP 76acfe4349 Rewrote the character setup preview icon code 2015-11-23 17:34:31 -05:00
oranges 268d2f0522 Adds tarajan race to the game
as a retardation meme reference
2015-11-23 18:48:02 +13:00
Razharas 9fcbb8f151 Merge pull request #13145 from MrStonedOne/patch-64
Fixes readmin not working with keys
2015-11-23 08:19:42 +03:00
Kyle Spier-Swenson 184b7ea5ce Fixes library computers thinking they already built their menu 2015-11-22 14:49:29 -08:00
phil235 77de108fe7 Merge pull request #13143 from Anonus/blobactors
Fixes up blob_act()
2015-11-22 18:42:15 +01:00
phil235 1fbd41fd91 Merge pull request #13140 from Anonus/revenfixes
Revenant Bugfixes
2015-11-22 18:28:05 +01:00
Nerd Lord 1c2c00759d oh wait I shouldn't have done that anyway
revenants don't get nar-sied sorry lady you'll have to eat something else
2015-11-22 12:13:34 -05:00
Cheridan ee75d5a24e Merge pull request #13131 from octareenroon91/patch-30
Spill Oxygen / Obtain Atmosphere
2015-11-21 23:52:34 -06:00
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
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
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
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
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
octareenroon91 5b429cf2fe remove commented-out code from pen.dm
fine
2015-11-17 18:43:40 -06: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