Commit Graph

12467 Commits

Author SHA1 Message Date
Jordie0608 4fd2c24ca5 zeroth laws can be removed with core boards 2015-05-28 19:38:06 +10:00
Jordie0608 b310811fdd reverts removing protectstation and clearing zeroth law 2015-05-28 19:13:30 +10:00
Cheridan fda7db219c Merge pull request #9633 from spasticVerbalizer/muteMessage
Fixes being mute giving no feedback when trying to speak
2015-05-27 23:27:25 -05:00
GunHog 3b75f04cb7 Autolathe Destination Tagger and Hand Labeler
Adds Destination Tagger and Hand Labeler to autolathe.
2015-05-27 12:49:36 -05:00
Cheridan 38edabf684 Merge pull request #9649 from Incoming5643/moooooooode7
Antagonists Will No Longer Show Up as MODE in round end reports
2015-05-27 09:34:23 -05:00
Jordie0608 e82c02744e paerbin clickdown, removed protectstation, rounded ui chem/plasma count, non-mob hivebot beacon 2015-05-27 16:54:13 +10:00
Jordie0608 0cafaf9373 zeroth laws can be removed with core boards 2015-05-27 12:09:09 +10:00
Cheridan efc7cce835 Merge pull request #9643 from phil235/PoppyseedFix
Fixes poppyseed mutating into tomato seeds instead of geranium/lily
2015-05-26 15:15:16 -05:00
Cheridan 068afd71cc Merge pull request #9574 from RemieRichards/NewDroneSkin
New Drone Skin
2015-05-26 14:27:56 -05:00
Cheridan a5c943f19c Merge pull request #9598 from Jordie0608/mfwtortoisegitrefusedtobelievethereweremergeconflicts
Fixes #7767, Readds shuttle areas for teleporting
2015-05-26 14:17:40 -05:00
spasticVerbalizer db5b79d0a6 Stops humans from making blood drops while in lockers/bodybags 2015-05-26 20:15:56 +02:00
Cheridan c4254a727d Merge pull request #9638 from CosmicScientist/EnglishFixes
Fixed some general spelling and grammar
2015-05-26 03:53:37 -05:00
Cheridan af31d8d255 Merge pull request #9639 from SconesC/pins-typo
Fixes Clown/DNA pin typo, updates descriptions
2015-05-26 02:32:21 -05:00
Jordie0608 dac0ee17e7 Merge branch 'master' of https://github.com/tgstation/-tg-station into mfwtortoisegitrefusedtobelievethereweremergeconflicts 2015-05-26 15:10:30 +10:00
Remie Richards 9c54b3b9f2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewDroneSkin
Conflicts:
	icons/mob/head.dmi
2015-05-26 01:13:24 +01:00
Incoming 69f8f6575b Antagonists Will No Longer Show Up as MODE in round end reports.
Instances where the game would give special treatment to MODE players will instead check to see if a player's assigned_role (job) matches their special_role (antag status). All antags that start off station (as well as ninjas for some weird reason) were affected.

Fixes #8743
2015-05-25 15:58:32 -04:00
Remie Richards 373c72773f Merge pull request #9617 from Miauw62/maniasureamgoodatcomingupwithgooddescriptivebranchnamesdontyouthinksobecausethisbranchnameisverygoodanddescriptive
Makes all machines use the robot font.
2015-05-25 18:31:15 +01:00
Remie Richards d97da2d9d4 Merge pull request #9590 from xxalpha/memech
Fixed Changeling Revival
2015-05-25 18:29:51 +01:00
Remie Richards c5a2c5d396 Merge pull request #9572 from Aranclanos/stealthAdminPM
Fixes admin-PM on stealth
2015-05-25 18:28:32 +01:00
Remie Richards 61c0ddebbb Merge pull request #9553 from AnturK/probing_fan_club
Adds abductees to check antags panel
2015-05-25 18:14:10 +01:00
phil235 20a28f7d9e Fixes poppyseed mutating into tomato seeds instead of geranium/lily 2015-05-25 14:48:14 +02:00
Cheridan a7a5a9acda Merge pull request #9543 from Aranclanos/astar
AStar fixes
2015-05-25 06:24:36 -05:00
spasticVerbalizer 06d521e081 Wrong spanclass 2015-05-25 10:30:40 +02:00
Cheridan cbb91c601f Merge pull request #9616 from Jordie0608/ifhuamnityexpandstoanothersolarsystemwewillhavetorenamesunglasses
Bugfix goes Forth+1
2015-05-24 23:39:40 -05:00
Cheridan fb2beca318 Merge pull request #9602 from Aranclanos/AItracking
Fixes all possible exploits with the AI tracking href link
2015-05-24 23:26:31 -05:00
Cheridan f12f12ed60 Merge pull request #9562 from Aranclanos/newscaster
Newscaster code big cleanup.
2015-05-24 19:47:05 -05:00
Cheridan ad8750eeb7 Merge pull request #9615 from phil235/RuntimesFixes
Runtime fixes and stuff.
2015-05-24 19:40:53 -05:00
Cheridan f5c0addf40 Merge pull request #9606 from phil235/FixAddReagentRuntime
Fixes runtime division by zero in add reagent proc
2015-05-24 19:17:41 -05:00
Cheridan 7a5f2453e6 Merge pull request #9612 from Aranclanos/lobbyMusic
Fixes a really strange case where the lobby music will play after you joined the round
2015-05-24 19:13:12 -05:00
Cheridan 99f026d441 Merge pull request #9608 from phil235/TagFiringPinFix
Fixes two runtimes
2015-05-24 18:29:45 -05:00
Cheridan 8cc916c52b Merge pull request #9618 from phil235/RuntimesMustDie
More runtimes fixed
2015-05-24 18:11:13 -05:00
Cheridan 9ff4551315 Merge pull request #9614 from Miauw62/WUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUBWUB
Makes AIs not hear local speech with two spaces.
2015-05-24 18:06:17 -05:00
SconesC cb2abd0418 Fixes typo and changes desc for clarity 2015-05-24 15:31:49 -07:00
CosmicScientist a94075d07d Edited pAIcard displayed message, donksoft dart description and some tips of the round. 2015-05-24 20:49:06 +01:00
spasticVerbalizer 190728770c Adds mute warning when trying to speak 2015-05-24 18:05:11 +02:00
spasticVerbalizer ab28bb26e8 Feedback 2015-05-24 17:52:01 +02:00
Jordie0608 2b5d26663f fixes quick equip to backpacks making no sound 2015-05-24 23:22:42 +10:00
AnturK 3b1a5fbdca Fixes some false positives 2015-05-24 15:11:50 +02:00
AnturK 2638a5d4e9 Fixes editing associative lists 2015-05-24 14:56:39 +02:00
Jordie0608 8c10127e1f fixes noshield flag and movable occupied processors 2015-05-24 22:52:28 +10:00
spasticVerbalizer b7f29c9a67 Added quick-equip verb for drones 2015-05-24 14:13:38 +02:00
phil235 77febafb52 Merge pull request #9569 from Incoming5643/readthisgoddamnit
makes the "don't kill the guy who animated your statue" message huge
2015-05-24 01:02:03 +02:00
xxalpha f38683b871 Fixed a few small things. 2015-05-23 22:39:17 +01:00
phil235 f643769ef4 Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life(). 2015-05-23 22:34:04 +02:00
xxalpha 14de0a4346 Merge remote-tracking branch 'upstream/master' into mineralcontainer
Conflicts:
	code/modules/clothing/shoes/bananashoes.dm
	tgstation.dme
2015-05-23 21:30:52 +01:00
Miauw f630cce730 Makes all machines use the robot font. Fixes #8575 2015-05-23 18:15:26 +02:00
phil235 554760e5f2 Merge pull request #9512 from xxalpha/itsakindofmagic
A second handful of fixes.
2015-05-23 16:52:51 +02:00
Jordie0608 fd10bfb9ab afk check for mutiny and lockers dont count as fleeing in rev/gang 2015-05-24 00:05:52 +10:00
phil235 ec6e318343 Fixes extinguisher (w/safety off) spraying water when placed on a table.
Fixes runtime when putting beaker in autolathe.
Fixes spray can empty message appearing when placing it on a table.
Fixes experimentor manual not having a title.
Fixes runtime with engine goggles updating nearby objects visibility.
Fixes runtime when looking at picture from the AI camera.
Updating the 'can_be_placed_into' list for items so their afterattack don't do anything when placing them in experimentor, autolathe, destructive analyzer.
Fixes soap starting to clean the table when placed on it.
Fixes drinking glasses having capitalized names.
2015-05-23 16:03:48 +02:00
Miauw f48c3f2411 Makes AIs not hear local speech with two spaces. Fixes #6482
Also removes an unneeded say_quote() override.
2015-05-23 14:33:31 +02:00