Commit Graph

14295 Commits

Author SHA1 Message Date
phil235 c1a37bb2e0 Derp, I hate fixing merge conflicts... 2015-06-28 15:27:58 +02:00
phil235 e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
AnturK 58f74302b0 Fixes spawning teams. Maybe. 2015-06-28 14:28:50 +02:00
Razharas 98c2bd18db Merge pull request #9620 from xxalpha/mineralcontainer
Fixed banana shoes mineral handling.
2015-06-28 15:07:17 +03:00
barackobama 7dfcc292b7 add a variable to mmi to indicate if it's of the syndicate variety as
suggested
2015-06-28 12:44:25 +01:00
AnturK 5dbd55561d Adds eating corpses/items. 2015-06-28 11:40:36 +02:00
MMMiracles dcdd122f47 Adds europoor and cyka bylat (WIP) apparel to appeal to the inferior masses. assblastusa. 2015-06-28 05:11:32 -04:00
Cheridan f534e3c0ec Merge pull request #10200 from Jordie0608/whoevenusesthese
Fixes Cheridan being a dork
2015-06-28 02:27:33 -05:00
MMMiracles 9097c25cb9 Adds patriotic apparel for upcoming 4th of July. ASSBLASTUSAUSAUSA. 2015-06-28 03:09:55 -04:00
nullquery a6ce6abfe3 Merge pull request #8 from nullstation/master
Merge with upstream
2015-06-28 07:09:40 +02:00
barackobama 0316a836cb add a Syndicate surgery dufflebag full of tools to the uplink
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
Razharas 1a5be75225 Merge pull request #10196 from MrStonedOne/thisshouldhavebeendonesooner
Admin help tweaks.
2015-06-28 02:55:53 +03:00
MrStonedOne 9a64d1db9e Removes duplicate variable in adminhelp. 2015-06-27 16:49:39 -07:00
Ikarrus 8c62ccfe2e Moves clothes from out of equipment lockers and into wardrobe closets
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
Ricotez 84231643c5 -Humans with tails and/or ears are considered not entirely human, and locked out of important positions. 2015-06-27 22:51:07 +02:00
MrStonedOne d9da2290e8 Cleans up adminhelp keyword searcher and changelog for #10196. 2015-06-27 13:03:47 -07:00
Ikarrus 7894263033 Destructible Clothing Tweaks
- Fixes runtime with burning decals without reagents
- Adjusts some burnable flags
- Removes minimum shred prob()
2015-06-27 13:33:33 -06:00
Ricotez b8811f23e0 -Added two new types of mutant accessories for humans: tail_human and ears. These ears are considered mutant parts and don't override normal human ears.
-Added one ear and one tail accessory to these categories, obtained from the kitty ears. The ears are obviously cat ears, but the tail can pass for a monkey tail without ears.
-Humans can now also edit alien/mutant colours. They have access to the full range of colours, but if the player switches back to lizard and the colour is too dark, it'll be reset to the default.
-Renamed the original tail to tail_lizard. All references are properly updated and nothing has to be changed.
-Could not solve an annoying bug with the setup window, where a lizard tail is rendered whenever a human tail is set. This problem only exists in the setup window and does not affect the sprite in-game.
2015-06-27 20:57:54 +02:00
phil235 dc9b7f4496 Merge pull request #10184 from Razharas/DatumCrafting
Fixes telesci console icon
2015-06-27 20:33:21 +02:00
Dorsisdwarf e12bc89fb0 Un-bashes goofball 2015-06-27 19:06:38 +01:00
LaharlMontogmmery 9591d2255d Hoping this solves the merge conflict 2015-06-27 19:23:13 +02:00
Dorsisdwarf db5a0109d6 Buffs capacity of cigars to be greater than cigarettes, removes fucking stupid messages from nicotine, buffs nicotine slightly. 2015-06-27 18:04:43 +01:00
Razharas 6ab2eb78e0 Merge pull request #10155 from Ikarrus/shredme
Burnable Objects & Clothes [Ready]
2015-06-27 18:29:14 +03:00
Ikarrus 59ca40f03d Burning objects are processed every tick now instead of using a spawn() check 2015-06-27 09:22:14 -06:00
Razharas 3d556ea970 Some varedit improvements
Fixed give spell window hiding most important part of the spell types
Added call proc to varedit so all things you can open in varedit you can
also call procs on
2015-06-27 18:00:57 +03:00
Jordie 5e27cc1fec fixes syringe filling with < 3 volume 2015-06-27 20:49:37 +10:00
NullQuery b977ea8be6 Merge branch 'hi-extended' of https://github.com/nullstation/-tg-station into hi-extended 2015-06-27 10:56:58 +02:00
NullQuery 3ac02c82e5 Fix for the "Populate world" verb. 2015-06-27 10:56:35 +02:00
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