Commit Graph

24890 Commits

Author SHA1 Message Date
Bjorn Neergaard b5113aa5f8 Make Cyborg Toner refillable by Recharging Stations.
Closes #13073
2015-11-23 09:55:06 -05:00
Bjorn Neergaard e885fd8879 Fix Wooden Barricades not taking bullet damage
* Add bullet_act() proc
* Make Wooden Barricades check Bullet damage types
* Rebalance Wooden Barricade damage
* Also clean up some messy code

Fixes #13154
2015-11-23 01:19:11 -05:00
Incoming 9126bbfaf6 Removes supermatter sword from wizards: It is not balanced, shouldn't be balanced, and won't be balanced.
Removes veil render from wizards: Singularities at round start isn't fair to anyone. People who want to go meme wizard get options to meme with but this is just ridiculous.

Folds Mjolnir and Singularity hammer into the offensive category to remove the weapons category.

Doesn't touch multiverse sword war, which is pretty damn silly, but at least a unique experience.
2015-11-23 00:51:22 -05:00
oranges 268d2f0522 Adds tarajan race to the game
as a retardation meme reference
2015-11-23 18:48:02 +13:00
swankcookie d56c24f841 SM Sword 2015-11-22 23:44:23 -06: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
Razharas ce1fbc5a56 Merge pull request #13121 from tkdrg/guyspls
Fixes changeling swap body kicking people to lobby
2015-11-23 08:18:45 +03:00
Menshin bbbd4360d0 Fixes login runtimes for observers.
Some failsafes for new_player login.
2015-11-23 00:19:35 +01: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 ab1e9f2d15 Merge pull request #13160 from Firecage/optablefix
Fixes op table buckling Take #2
2015-11-22 18:38:19 +01:00
Firecage e1891440fa Fixes op table buckling 2015-11-22 19:29:26 +02: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
KorPhaeron c646656e79 Valid 2015-11-22 06:41:30 -06:00
Jordie0608 9198120ee8 unifies energy gun self charging 2015-11-22 17:37:26 +11:00
Cheridan ee75d5a24e Merge pull request #13131 from octareenroon91/patch-30
Spill Oxygen / Obtain Atmosphere
2015-11-21 23:52:34 -06:00
MMMiracles 78dc539588 why even live tbh 2015-11-21 18:09:45 -05: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
duncathan salt a49b52cb98 Merge pull request #13038 from Niknakflak/JumpIntoDatDrama
Nerfs Water mildly :^)
2015-11-21 16:24:16 -06:00
MMMiracles db84542278 Merge branch 'master' of https://github.com/tgstation/-tg-station into spookycaves 2015-11-21 14:33:45 -05:00
MMMiracles 13e4f16ce5 more edits 2015-11-21 14:23:18 -05:00
Cheridan 336e5f6657 Merge pull request #13134 from KorPhaeron/vomit
Bar no longer starts covered in vomit
2015-11-21 11:55:29 -06:00
Firecage 9fe09959a4 Changes the base toolspeed var to 1 2015-11-21 19:40:20 +02: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
Nerd Lord b7dedcf885 Fire, no. Fire, you can't do that.
Also bonus sanity, storage blobs now give and remove the point bonus properly.
2015-11-21 10:57:53 -05:00
KorPhaeron 3510f10791 Phone editing is hard 2015-11-21 09:42:07 -06:00
KorPhaeron cf1f206676 Glowing lava 2015-11-21 09:38:58 -06:00
KorPhaeron 888fe9fb30 Default 2015-11-21 06:43:01 -06:00
KorPhaeron 3aa39e0c52 Lava 2015-11-21 06:29:28 -06:00
octareenroon91 e2a27fb018 Add Carbon Dioxide. 2015-11-21 06:20:16 -06:00
AnturK caa07f84c4 Adds Send To All to Lawyer/Captain cartridges 2015-11-21 12:24:41 +01:00
Kyle Spier-Swenson 226c92bbca Fixes readmin not working with keys 2015-11-20 21:11:26 -08:00
Incoming edb9830efa Merge branch 'hey_thanks_for_reading_the_branch_name' of https://github.com/Incoming5643/-tg-station into hey_thanks_for_reading_the_branch_name 2015-11-21 00:07:51 -05:00
Incoming 494dd50ff6 Merge branch 'master' of https://github.com/tgstation/-tg-station into hey_thanks_for_reading_the_branch_name
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
2015-11-21 00:06:47 -05:00
Cheridan b4f5152e6d Merge pull request #13124 from octareenroon91/upstream-tg
Add numbers and star graffiti to crayon/spraycan designs.
2015-11-20 22:59:51 -06:00
Nerd Lord 55b38090cd Fixes a runtime when failing to place a storage blob
holy shit why wasn't this in New() who coded this
2015-11-20 22:00:07 -05: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
Nerd Lord 525c40be39 Blob help has a fucking button, holy shit blobs you can do better 2015-11-20 19:08:50 -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
Cheridan e9adbfa410 Merge pull request #13117 from AnturK/wheresthedom
Adds Dominators to PoI list
2015-11-20 17:00:35 -06:00
Cheridan 1d13fa4fea Merge pull request #13119 from bgobandit/agentcardfix
ID consoles no longer strip non-standard access, such as on agent cards.
2015-11-20 16:21:11 -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
KorPhaeron 3e9700ce65 Clean bar 2015-11-20 12:10:58 -06:00
Nerd Lord 6b72222dbf Gives blobs a fukken hud, with buttons and everything.
Blobs can now expand just by clicking.
Shield blob creation changed to ctrl-click.
Reverted expand cost to 5.
2015-11-20 11:58:55 -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