Commit Graph

13853 Commits

Author SHA1 Message Date
Incoming5643 b304e6bd9a Preserves shitposting
when you type something that looks like IC in OOC you'll get a pop up that will let you actually say it if that's what you meant to do. It defaults to no so real accidental IC OOC can mash out of the command in case what they said was ";help!"
2015-11-24 22:51:31 -05:00
as334 63b599519d unfucking shit ass plasma memes part HOPEFULLY LAST ONE 2015-11-24 22:31:54 -05:00
Cheridan ca502f136d Merge pull request #13180 from neersighted/airlock_electronics
Remove snowflake-y ID check code from Airlock Electronics
2015-11-24 21:29:42 -06:00
Incoming5643 cf2e566a00 Hashtag obscure functionality 2015-11-24 22:03:26 -05:00
Incoming 5b86fd84b0 OOC will now scrub out messages that start with . ; or : (the say channel modifiers and let the player know that they almost goofed up.
(if you want to make a fake IC in OOC joke you still can by adding a space before the message)
2015-11-24 21:54:20 -05:00
Cheridan 8a595c4cb5 Merge pull request #13184 from YotaXP/char-preview
Accurate Character Setup Preview
2015-11-24 18:48:30 -06:00
Kyle Spier-Swenson cf113733c6 Revert "Properly reverts timed injectors" 2015-11-24 15:56:59 -08:00
ktccd 8f24c37f46 Fixes issue #13126 (Better this time)
🆑 ktccd
bugfix: Blob pieces on some areas no longer count for blob mode victory
(Such as space or asteroid).
bugfix: Asteroid areas are no longer valid gang territory.
/🆑
2015-11-24 17:48:21 +01:00
bgobandit 92b5875e6b adds abandoned xeno outpost to mine room blacklist 2015-11-24 11:44:11 -05:00
bgobandit f435f18d6b fixed gunhog's shit, added new KA/res to asteroid rooms, added mesons to mech scanner 2015-11-24 07:18:54 -05:00
MMMiracles 671fa02edf almost there folks 2015-11-23 21:53:27 -05:00
duncathan salt 3e5de6d749 Merge pull request #12913 from KorPhaeron/lava
Lava turf
2015-11-23 20:02:26 -06:00
ktccd 9a2c60cac6 Fixes issue #13126and also a few other areas blobs shouldn't be win from absorbing (centcom, SPACE etc).
🆑 ktccd
Fixes bug #13126 and also a few other areas blobs shouldn't be win from
absorbing (centcom, SPACE etc).
Added a variable to areas.
Kept the original blobs list as a list of all blobs, in case that was
used somewhere else, and instead made a separate list for legit blobs.
/🆑
2015-11-24 01:09:01 +01: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
YotaXP 76acfe4349 Rewrote the character setup preview icon code 2015-11-23 17:34:31 -05:00
AnturK 05cb510dc7 Neater 2015-11-23 19:31:28 +01:00
Bjorn Neergaard 92a060a397 Remove snowflake-y ID check code from Airlock Electronics
Fixes #12895
2015-11-23 12:04:12 -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
swankcookie d56c24f841 SM Sword 2015-11-22 23:44:23 -06: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
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
Jordie0608 9198120ee8 unifies energy gun self charging 2015-11-22 17:37:26 +11: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 3aa39e0c52 Lava 2015-11-21 06:29:28 -06:00
AnturK caa07f84c4 Adds Send To All to Lawyer/Captain cartridges 2015-11-21 12:24:41 +01: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 525c40be39 Blob help has a fucking button, holy shit blobs you can do better 2015-11-20 19:08:50 -05: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
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