Commit Graph

12467 Commits

Author SHA1 Message Date
nullquery db9ecdfdc6 Merge pull request #5 from nullstation/master
Merge with upstream
2015-06-27 10:28:22 +02:00
nullquery e6602cf123 Merge pull request #4 from tgstation/master
Merge with upstream
2015-06-27 10:27:43 +02:00
NullQuery b4248b01e4 - Crew monitoring computer using the html_interface module
- Patch: Don't update html_interface clients that have been inactive for more than 10 minutes.
- Patch: Attempt to speed up _renderContent some more (in case of multiple clients) by using spawn.
- Patch: Second argument for hiIsValidClient hook: reference to the current html_interface object (used by crew monitoring computer).
- Feature: procqueue singleton. You can use this to put proc executions on a queue. Used by the crew monitoring computer to queue the update "for the next tick" when humans move.
2015-06-27 10:26:46 +02:00
Ikarrus 18098752ac Gang Tweaks
- Gang Lieutenants can buy gang tools now, but at a higher cost than the original boss
- Gang leaders can register additional gangtools to themselves for use as spares.
- Number of maximum lieutenants lowered to 2
- Pistol cost increased to 25 influence
- Uzi cost increased to 50 influence
- Uzi Ammo decreased to 20 influence
- Overcoats added to items the biogenerator can produce.

- Domination attempts reduced to 2
- Gang dominator time bonuses cannot reduce it lower than 5 minutes
- Showers will clean off lipstick and face paint
2015-06-27 01:12:54 -06:00
Ikarrus 6cc17a6243 Resolved Conflicts:
code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
Ikarrus 8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
Jordie 0d0f1a5f0d fixes dropper sprite 2015-06-27 15:25:58 +10:00
TheVekter 40a90ab8df ayy lmao merge conflicts 2015-06-27 00:02:46 -05:00
TheVekter 50c1fc487e Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit 2015-06-26 23:49:43 -05:00
TheVekter 16cdc39d2f Converts the jacket to a cosmetic, added to autodrobe and clothesmate, doesn't spawn in closets anymore 2015-06-26 23:48:18 -05:00
NullQuery e6ffb1a922 Fix for playing cards on systems with IE8 2015-06-27 05:51:59 +02:00
nullquery 1aac98a52a Merge pull request #3 from tgstation/master
Merge with upstream
2015-06-27 05:01:13 +02:00
Cheridan 46d7fb9bbd Merge pull request #10168 from phil235/FireaxecabinetFix
Fixes runtime with do_after()'s that don't use a target.
2015-06-26 20:12:15 -05:00
MrStonedOne 0aeffb3c0f Admin help tweaks.
The keyword scanner (thing that adds (?) links to player names in admin helps) has been moved to its own proc.
This has been added to all admin pms.
It has been added to asays as well, with the (FLW) link removed to avoid it being distracting.

Replying to an admin help (but not other forms of admin pms nor admin pm replies) by clicking on the name of the ahelper will now send a message to all admins letting them know you are typing up a reply to it. (this should avoid mutiple people replying to the same ahelp) (It also sends a message if you escape out of the ahelp reply as well)
2015-06-26 16:30:37 -07:00
MrStonedOne f06abf3e2f fixes compile error
One pr added a path to an item(#10018) but another pr changed that path(#9932).
2015-06-26 16:06:37 -07:00
Cheridan d493cc37b3 also makes the code compile i'm so nice 2015-06-26 17:43:17 -05:00
Cheridan 9f95965abf Suit Sensor Fixes
-Chameleon jumpsuit sensors now start off
-Fixes unreported(?) bug where prisoner jumpsuits would start randomized when they are supposed to be always-on.
2015-06-26 17:15:19 -05:00
Cheridan b4ab182867 Merge pull request #10142 from phil235/SleepypenFix
Fixes sleepy pen triggering morphine overdose message.
2015-06-26 15:54:27 -05:00
Cheridan a65ba96ecf Merge pull request #10020 from phil235/HiveloardCoreSmearing
Changing messages when using hivelord core
2015-06-26 15:45:31 -05:00
Cheridan b9cdb3384a Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
2015-06-26 15:34:24 -05:00
Cheridan 3f1ecc5721 Merge pull request #10097 from phil235/SomeFixes
Some little fixes
2015-06-26 15:24:46 -05:00
phil235 ee13658752 Merge pull request #10018 from pudl/sam
Abandoned Crates (Ported from Baystation12)
2015-06-26 19:07:58 +02:00
phil235 2e61607d3f Merge pull request #10105 from xxalpha/chief
Cleaned some clothing flags.
2015-06-26 19:03:13 +02:00
phil235 adf553db5c Removes the singularity's toxin damage effect on mob. 2015-06-26 18:14:34 +02:00
Cheridan f104517c89 Merge pull request #10146 from phil235/QueenUnconsciousIconFix
Fixes stomach rumbling message, large xenoqueen unconscious icon, stamina stacking on aliens
2015-06-26 10:51:47 -05:00
Cheridan 0b91e9d8e4 Merge pull request #10126 from Jordie0608/idkhowtheserverevenranwiththiserroraround
Critical fix to admin memos and watchlist
2015-06-26 10:44:03 -05:00
Cheridan 8c9169f9a8 Merge pull request #10144 from phil235/StimulantsBuff
Buffs stimulants reagent.
2015-06-26 10:37:46 -05:00
Cheridan 1ce57fa0b9 Merge pull request #10130 from xxalpha/fixfixfix
Fixed reviver implant emp_act() resetting cooldown time.
2015-06-26 10:00:28 -05:00
Razharas 792a30413e Fixes telesci console icon 2015-06-26 17:03:29 +03:00
TheVekter 88ee215429 Removed arm protection from jacket 2015-06-26 02:37:54 -05:00
Jordie0608 d3f78294ad fixes edit reason and log for follow 2015-06-26 16:13:40 +10:00
TheVekter 9ae5728a78 Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit 2015-06-25 19:15:08 -05:00
Incoming d0853e8c4f Gets rid of an old unneeded for loop, reverse copypastas it from where I picked it up. 2015-06-25 19:40:55 -04:00
Incoming ac321c547c Rainbow slimes finally added to practical play. To get one you have to raise slimes through select breeding to 100 mutation chance. Even if you're blessed with RNG This will take a minimum of 14 generations of slime. Red slime can help speed this a bit, but then you're trading plasma for time. From the default mutation chance you'd have to drop 6 of these potions.
Rainbow slimes only split into more rainbow slimes.

Rainbow slime cores spawn a random colored slime on use, the practical use is to allow xenobiologists to slime paths they didn't breed for initially if they practiced good slime eugenics. You're still at the utter mercy of RNG though.

Mostly a bragging rights reward.
2015-06-25 18:20:09 -04:00
NullQuery 15cdf9bfca Merge from upstream. 2015-06-25 20:30:19 +02:00
phil235 2aeefad94d Fixes runtime with do_after()'s that don't use a target.
Adding missing "target=src" to a couple do_after() calls.
You can now close a fire axe cabinet by clicking it with a full hand (if it's not broken/locked)
2015-06-25 19:05:23 +02:00
AnturK c50a1b027d Makes Morph untrackable when morphed. 2015-06-25 17:57:45 +02:00
AnturK 3cf513bf99 Adds morphing blacklist
Adds npc behavior
Adds spawn event
2015-06-25 14:46:30 +02:00
Remie Richards 4186d59e40 Filters the recipes you can currently craft to the top of the list. 2015-06-25 12:55:04 +01:00
phil235 8e62d51812 Merge pull request #9801 from AnturK/rosebud
Buffs whispers
2015-06-25 13:39:56 +02:00
Remie Richards 0611c9b3bb Adds a category for food items, adds some missing weapons and a Misc category 2015-06-25 11:58:42 +01:00
Remie Richards d5a7b352d5 Table crafting now shows all recipes, all the time. Table crafting now has a concept of "Categories", current ones are: Weaponry, Robots and Ammunition, Table crafting 30 item limit removed. 2015-06-25 11:14:59 +01:00
TheVekter 27b5d59d28 Ports over the military jacket from NTStation 2015-06-25 02:44:25 -05:00
Ikarrus 3d5f126779 Destructible Clothing [WIP]
- Clothes can be set on fire and extinguished
  - Any item can technically be set on fire and extinguished now, but only clothes (and paper) actually burn right now
  - All of a mob's clothing are burned if the mob is husked by fire
- Clothes will also have a chance of being shredded if you are caught in a bomb blast
  - The bigger the explosion, the higher the chance they have of being destroyed
  - Outer layer clothing (headgear and exosuits) take the shock first, which absorbs some of the shock for the clothes it covers, according to it's bomb armor
2015-06-25 00:06:47 -06:00
phil235 28a030360c Fixes wrong message when a mob moves while inside another mob's stomach.
Fixes large xenoqueen having wrong icon when unconscious.
Aliens now naturally recover from stamina damage.
2015-06-25 02:15:49 +02:00
Ikarrus b8e8aa9123 forceMove(picked) 2015-06-24 17:55:05 -06:00
phil235 83629764d8 Buffs stimulants reagent. Changes the uplink stimpack description (immune to stuns -> nearly immune) 2015-06-25 00:55:11 +02:00
AnturK 9f07b06b63 Adds Morph 2015-06-25 00:43:28 +02:00
phil235 3c6607ad19 Fixes sleepy pen having enough morphine to trigger the overdose message, making it not stealthy. morphine amount reduced from 30 to 20u. 2015-06-25 00:30:09 +02:00
phil235 a029f2852a Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02:00