Commit Graph

12206 Commits

Author SHA1 Message Date
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
AnturK b1bf6acab0 Changes spellbook description
Picks types from list
2015-11-17 15:17:46 +01:00
Shadowlight213 90ccd86130 Adds ability for syndie mobs to attack crit people. 2015-11-16 22:32:44 -08:00
Cheridan 183f3fa0c5 Merge pull request #13032 from Incoming5643/guide_to_the_races_of_star_wars
Roundstart races as a config
2015-11-16 22:27:26 -06:00
Razharas 822d085f6a Merge pull request #13044 from KorPhaeron/curvethebullet
Stops projectiles being blown away by spacewind
2015-11-17 06:06:25 +03:00
octareenroon91 4a5cda8a8b Introduce the four-color pen
Add a fancy pen that lets you choose between black, red, green, and blue ink.
2015-11-16 20:14:30 -06:00
Incoming 1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
duncathan salt 621c9e28c1 Merge pull request #13062 from optimumtact/chemchanges
Chemistry Balancing and Additions
2015-11-16 17:42:08 -06:00
Razharas 389f4e3779 Fixes bloodpacks
Fixes bloodpacks
2015-11-17 01:10:41 +03:00
Nerd Lord 3f1a28869f A STRONG INDEPENDENT ELDER GOD THAT DOESN'T NEED NO MACHINES 2015-11-16 17:08:25 -05:00
Razharas fd531118f4 Merge pull request #13037 from bgobandit/bloodlabels
Adds the ability to label blood packs.
2015-11-17 01:07:06 +03:00
Razharas 7489f929f2 Merge pull request #12964 from GunHog/Nanotrasen_Pindication
Reduces Loyalty Firing Pin tech requirement
2015-11-17 00:59:41 +03:00
bgobandit 4dee16a13d canusetopic for ayyranclmaos 2015-11-16 16:53:19 -05:00
Kyle Spier-Swenson ad2cf316e5 Fixes compile error in library computers from me coding while too high 2015-11-16 13:01:34 -08:00
Nerd Lord 91095f57ce Constructs now have action buttons!
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
2015-11-16 15:21:41 -05:00
Nerd Lord 757d009e4f Constructs now have action buttons!
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
2015-11-16 15:20:13 -05:00
AnturK 05ff5552b2 Makes staff of doors create random mineral doors. 2015-11-16 21:10:34 +01:00
GunHog a254c87e35 Reverts the removable change. 2015-11-16 09:59:45 -06:00
Tkdrg 436c3cacad Fixes the maxbodytemp of some simple_animals
Fixes #12463 (the bug claims that they catch on fire, but that is
untrue, they were being damaged by temperature only)
2015-11-16 12:21:53 -03:00
KorPhaeron d735bec085 Invisible 2015-11-16 03:05:51 -06:00
MrStonedOne c784ca902e Ports /vg/'s asset cache system; lowers interface lag when clients connect.
Byond will queue all browse(), browse_rsc(), and winset() calls to the client, to ensure they load in order, and ensure any resources from a browse_rsc call (css/html/js) are already at the client by the time any html windows loads.

How ever, each file is processed separately, and byond will wait for the reply from the client before it will send the next file.

Our current system sends all of these html resource files to the client at once when they connect, this is the sole cause of the lag when a client connects. Byond will not send the client a file it already has, but it has to ask the client first, and it does so one file at a time, waiting for a reply from the client before sending the next one down the pipe.

This system fixes that.

Basically it works like this:
Client connects: nothing happens, no massive queuing of browse_rsc() calls, so no interface delay
Client opens a asset_cache controlled html based interface
Asset cache gets notified by the html based interface what assets the client needs to have.
Asset cache checks to see if it's sent that client those files.
Asset cache sends the missing ones, adding them to the list of assets the client has.

This basically spreads out the delay to when you first open a window that uses resources, where it is much more manageable.

I've kinda done a halfass port without too much thought, I see some room for improvement to better fit /tg/'s coding style and make the system more flexible. I'm PRing this because if I don't, it will never get finished.

PDAs and html_interface has been imported in to the new system lazily to test. at 100ms connection start interface lag went from 35 seconds to 16 seconds. Nanoui hasn't been imported, and once it is, that should drop down to almost nothing.

I'll work on this some more after some sleep.
2015-11-15 23:49:05 -08:00
Razharas e9dae3be88 Merge pull request #13015 from SuperSayu/Holodecker
Holodeck Upgrades [MAP]
2015-11-16 04:51:49 +03:00
KorPhaeron ff7b7535e8 Spacewind fix 2015-11-15 19:35:19 -06:00
Vincent faf5ddaceb Holodeck refactor and Enchancements
Moves holodeck code to modules/holodeck.  Repaths holodeck structures a little.  Cleans holodeck code and prepares for additional features (multiple holodecks, etc).  Should fix #4828.

Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.

All items spawned by the holodeck will do only stamina damage, except when emagged.  This allows emergency medical to be staffed with scalpels and bonesaws and such.  Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
Razharas 70391716e7 Merge pull request #12400 from bgobandit/cakehatbugs
Cake hats now properly emit light.
2015-11-16 03:01:07 +03:00
Kyle Spier-Swenson 405b8b8284 Fixes some more compile errors in library computers 2015-11-15 15:37:36 -08:00
Kyle Spier-Swenson aa3040003a Fixes library computers missing a var breaking compiling. 2015-11-15 15:18:39 -08:00
Kyle Spier-Swenson 818dc2e9b4 Makes external archive only show pages of 250 books
250 because any less seemed like you would have to page too much to browse the archive.

All actions preserve the current page.

Page splitting and calculation is cached on first load of the external archive for that computer (has to be per-computer because the html is cached and it needs to have the src arg)
2015-11-15 15:13:35 -08:00
duncathan salt 30ea5ba36d Merge pull request #13026 from Anonus/blightmode
Revenant Changes LXIX
2015-11-15 16:01:11 -06:00
duncathan salt 7f48bf70f5 Merge pull request #13027 from tkdrg/FUK
Pickup() improvements
2015-11-15 15:59:05 -06:00
bgobandit f01fd1f942 Adds the ability to label blood packs. 2015-11-15 16:45:43 -05:00
bgobandit 5cdeabe0a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into cakehatbugs
Conflicts:
	code/modules/clothing/head/misc_special.dm
2015-11-15 16:30:03 -05:00
Cheridan 0baf7610dd Merge pull request #12999 from Anonus/grillby's
Plasmamen can now man the bar
2015-11-15 14:26:58 -06:00
Cheridan caa7adeeba Merge pull request #13022 from tkdrg/morefix
R&D and Misc Fixes/Tweaks
2015-11-15 14:19:44 -06:00
AnturK 90dc10f2e2 Fixes HoG gods being visible to silicons 2015-11-15 20:35:00 +01:00
AnturK 8f4cbf12e5 Fixes revanant visibility for ghosts 2015-11-15 19:33:12 +01:00