Commit Graph

12467 Commits

Author SHA1 Message Date
xxalpha 4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
Remie Richards 2c899c84ab Fixes an indentation error that causes "Tools: X" to repeat in Tablecrafting. 2015-07-02 17:33:11 +01:00
Remie Richards 846d3e56c1 MINOR changes to the animation, it's now guaranteed to "smash down" into the victim, where as it was kind of random before (wtf byond?) it's also faster due maintain the same slam/smash effect. 2015-07-02 12:35:50 +01:00
Remie Richards d3e1521214 Changes the effect, the Weapon overlay now fades (to half transparency) and shifts it's pixel_z over the course of the animation. flick_overlay() now uses spawn() 2015-07-02 11:54:45 +01:00
MrStonedOne 7ba58e834b Fixes special characters not working in asay/apm 2015-07-01 20:24:52 -07:00
Ikarrus 55bec2d24d Adds a thrownby var that's used by admin logging. 2015-07-01 13:00:12 -06:00
WJohn cf921dec58 Merge pull request #10163 from RemieRichards/TableCraftingUnFucking
Table Crafting Update
2015-07-01 14:29:55 -04:00
Ikarrus 07bf0fd953 You can splash yourself with reagent glasses now 2015-07-01 12:01:58 -06:00
xxalpha cbf041c054 MATERIAL DATUM 2015-07-01 18:32:30 +01:00
Razharas ce02df75f8 Merge pull request #10285 from Ikarrus/gangimplantmania
Gang Update: Implants Edition
2015-07-01 18:43:21 +03:00
Remie Richards 4eba0b0802 Fixes SNPCs thinking a bullet attack was a melee attack (which obviously causes issues with this system) 2015-07-01 12:43:02 +01:00
Remie Richards 9f8a4be5a0 Combat now shows an overlay of the melee weapon used. it appears on screen for 5 ticks (1/2 a second) 2015-07-01 12:00:15 +01:00
Jordie0608 3b33a3da9f Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13countsasaweaponofmassfrustration
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	icons/obj/machines/bignuke.dmi
2015-07-01 19:41:00 +10:00
oranges ae99453a72 Remove taser firing delay
Making the game unintuitive as fuck and annoying as shit is not a balance
change, I'm frankly quite suprised it was merged in the first place

In the future don't nerf the interface as a balance fix
2015-07-01 20:44:01 +12:00
Swag McYolosteinen f7c7faad06 Merge pull request #10291 from RemieRichards/get_apc()-NotShitVersion
Fixes get_apc() being shit
2015-07-01 10:33:12 +02:00
Remie Richards cd36b1665b Merge pull request #10202 from nullstation/hi-extended
HTML interface module: Port of the crew monitoring computer
2015-07-01 05:59:39 +01:00
xxalpha cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Ricotez 79a41996f5 - Added new confic option: JOIN_WITH_MUTANT_HUMANS
- Uncommented all stuff that was commented in the last commit.
- Added a check in front of it that blocks them from showing up in the setup window if JOIN_WITH_MUTANT_HUMANS is not set.
- Included new game_options.txt as an example.

The tgstation server has never used the example game_options.txt so the new config option will not be enabled on it. Even if it did, the option starts commented out in the file.
2015-06-30 23:53:13 +02:00
phil235 782fdd7678 Merge pull request #10259 from Razharas/DemonFix
Fixes dummy objects being rightclick visible
2015-06-30 23:04:30 +02:00
Ricotez acd297e7f5 -Added new option to the VV menu drop-down list: Toggle Purrbation.
-Putting a human on purrbation gives them cat ears and a cat tail, and sends them the message 'You suddenly feel valid.'
-Removing a human from purrbation reverses the effects, and sends them the message 'You suddenly don't feel valid anymore.'
-Renamed "Long and Smooth" tail to "Cat" tail. I wasn't kitten anyone with the old name.
-Updated changelog.
Forgot to include these two in the last commit:
-Cat ears and tail now use your hair colour instead of your mutant colour.
-Added changelog.
2015-06-30 20:17:55 +02:00
Cheridan 3329970b55 Merge pull request #10266 from phil235/SpaceDrugOverdoseTweak
Tweaks space drug overdose and space drug blob effect.
2015-06-30 11:02:15 -05:00
spasticVerbalizer 7784054999 Added sanity check to disposal climbing 2015-06-30 15:45:48 +02:00
Remie Richards d9ec8a1008 area/proc/get_apc() is no longer shit and does not lag (AT ALL) on large areas anymore, the new method stores a list of all APCs in the world, and checks if their area var is equal to the area get_apc() was called on. 2015-06-30 12:20:28 +01:00
Ikarrus 1e30fc4b6c Gang Update: Implants Edition
- Multiple gang leaders are spawned at round start, the number which depends on server population
- Only one boss per gang, the rest are lieutenants
- Only the gang boss can recall the shuttle
- Gangsters can no longer be promoted mid-game.
- Security can once again deconvert gangsters with loyalty implants
  - A message is shown if the deconversion destroys the implant in the process

- Added an Implant Breaker item to the gangtool as a purchasable item for 10 influence each
  - They are a one-use item that destroys all implants in the target, including loyalty implants
  - They will also attempt to recruit the target before destroying itself
  - As this is an implanter it requires the target to remain still for a few seconds to administer it
- Implanters no longer work if the target is wearing headgear. Remove them first

- Added help text whenever you buy certain items from the gangtool
- Spare gangtools now cost 30 influence for everyone
  - They no longer give you a free pen
- Increases domination limit back to 3
- Purchased outfits are automatically equipped in your hand, if possible
- Gang boss has a 3 minute window at round start to select an outfit style. If he doesn't select one, the his lieutenants may pick one. No gang outfits can be created without a style picked first.
  - This is just to give the gang boss the first opportunity to pick an outfit style for his gang
- You can now see how many outfits your gangtool has in stock
- Outfits are no longer used up if you cancel the style selection prompt
- Loyalty implant destruction message has been moved to its Destroy()
2015-06-29 23:50:06 -06:00
oranges e587e0c077 Remove helmeted mounted cameras from game 2015-06-30 16:08:48 +12:00
Cheridan 3fe48e2f26 Merge pull request #10248 from optimumtact/patch-6
log simple animal attacks to attack log
2015-06-29 23:03:12 -05:00
Cheridan 604bcdef68 Merge pull request #10206 from Dorsisdwarf/smokeforyourhp
Buffs capacity of cigars to be greater than cigarettes, removes fucking stupid messages from nicotine.
2015-06-29 22:20:51 -05:00
Cheridan 1368794705 Merge pull request #10112 from Ikarrus/whyamiinspace
Reactive Teleport Armor can teleport the user to space tiles again
2015-06-29 22:11:03 -05:00
Cheridan d36c01412f Merge pull request #10238 from Incoming5643/catgirls2015
Catgirls 2015
2015-06-29 21:44:39 -05:00
Cheridan 87cd31c11f Merge pull request #10211 from Ikarrus/burntweaks
Destructible Clothing Tweaks and Fixes
2015-06-29 21:38:20 -05:00
Ikarrus 5792e7ccd9 - Swaps floor throwing and distance throwing
- Reagent containers thrown by bartenders will never spill if it doesn't collide into anything
2015-06-29 19:31:18 -06:00
Ricotez 3ea2eae81b -Removed roundstart access to ears and human tails. They are an admin only thing now.
-You can now set which colour an accessory should use: HAIR, FACEHAIR, EYECOLOR, MUTCOLORS or its own (0). Right now only mutantparts use this.
-Consequently, humans lost their ability to change mutant colours, although the special flag MUTCOLORS_PARTSONLY still exists.
2015-06-29 23:49:55 +02:00
Cheridan 3b4dbc4f27 Merge pull request #10216 from nukeop/syndiesurgerybag
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
Dorsisdwarf 1f2e672f24 Remember kids: Smoking makes you RUGGED 2015-06-29 21:36:16 +01:00
Cheridan a883997fdc Removes Access Restriction on Mining Shuttle Console 2015-06-29 15:28:36 -05:00
Razharas 3705c6182a Removes autoclick for real this time 2015-06-29 23:27:20 +03:00
Razharas f3f398feb9 Removes the autoclick, keeps the dark click 2015-06-29 23:17:16 +03:00
Razharas 1b793f89c8 Merge branch 'master' of https://github.com/tgstation/-tg-station into DarkClick
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/client/client defines.dm

Fixes conflicts
2015-06-29 23:15:06 +03:00
Ricotez 44b795138c -Adds new proc-based job check for species. If enforce_human_authority is set, the various pieces of code that deal with roundstart job stuff will call this proc on your preferred species with 2 arguments: the name of the job and the list of mutantparts you have currently set.
-The proc is defined as proc/qualifies_for_rank(var/rank, var/list/features), and by default defined to always return 1. You must override it locally in your species definition to set special job properties.
-Lizards will fail the check for jobs in command_positions and pass it for any other job. Just like before.
-Humans will always pass the check if they don't have ears or tails. If they do have ears or tails, they will fail the check if the job is in command_positions, engineering_positions, science_positions, medical_positions, security_positions or equal to "Quartermaster", effectively limiting their job selection to civlian, lower supply and silicon jobs.
2015-06-29 22:13:25 +02:00
GunHog 360256e070 Ore Redemption Machine ID improvement
- The Ore Redemption Machine now releases minerals to authorized users
without the need for an inserted ID.
2015-06-29 12:53:45 -05:00
Swag McYolosteinen 47b1deb528 Merge pull request #10204 from Razharas/VarEdit
Some varedit improvements
2015-06-29 19:18:28 +02:00
Razharas d790f99bef Merge branch 'master' of https://github.com/tgstation/-tg-station into PinRemoval 2015-06-29 20:14:08 +03:00
Razharas 4bea01ce34 Del pin in gun
Del pin in gun
2015-06-29 20:13:43 +03:00
phil235 588c12ee22 Merge pull request #10219 from xxalpha/mouthgag
Fixed not being able to eat with adjusted masks.
2015-06-29 18:23:56 +02:00
phil235 f1cd3069ad Tweaks space drug overdose and space drug blob effect. 2015-06-29 18:05:39 +02:00
Razharas 1a0c027cc2 Added pin removal recipe
Added pin removal recipe
You need plasmacutter to do it and some other shit
2015-06-29 18:43:37 +03:00
phil235 a8bc78e16e Merge pull request #10125 from Iamgoofball/patch-85
Buffs the traitor toxins
2015-06-29 17:36:11 +02:00
phil235 a39effd14c Merge pull request #10193 from Cheridan/what_a_fluke
Suit Sensor Fixes
2015-06-29 17:32:44 +02:00
Razharas 2ce9bdfb00 Fixes smartfridge construction and deconstruction
Fixes smartfridge construction and deconstruction
Added special proc for machinery to be called on deconstruction akin to
construction
2015-06-29 17:12:24 +03:00
Razharas 8a26ff2527 Fixes dummy objects being rightclick visible
Fixes dummy objects being rightclick visible
2015-06-29 15:38:39 +03:00