Cheridan
2aa0247b00
Merge pull request #9701 from Cuboos/SoundsEp2_WizardBoogaloo
...
Wizard Sounds has the update. Been a bit since i've done a commit, so…
2015-05-31 15:51:59 -05:00
Cheridan
b36a1506b7
Merge pull request #9683 from spasticVerbalizer/apostropheCatastrophe
...
Makes AI camera track link not break on weird characters
2015-05-31 15:29:46 -05:00
Cheridan
9dc7dc17ab
Merge pull request #9678 from spasticVerbalizer/injuryCheckMessage
...
Changes injury check message to be less misleading, fixes #9600
2015-05-31 15:23:30 -05:00
Cheridan
def67decf8
Merge pull request #9693 from Razharas/MobFix
...
Fixes russian ranged mobs being broken
2015-05-31 14:28:25 -05:00
spasticVerbalizer
c9eee03e71
Namepart instead of M.name
2015-05-30 18:00:08 +02:00
Razharas
6dd413c99f
Merge branch 'master' of https://github.com/tgstation/-tg-station into PrinterFix
2015-05-30 17:27:43 +03:00
Razharas
6f1a705777
Fixes imprinter volume with beakers
...
Fixes imprinter volume with beakers
2015-05-30 17:23:39 +03:00
spasticVerbalizer
3c4f5f46f0
More track hrefs + fix for tcs issue
2015-05-30 12:06:34 +02:00
Cheridan
5b4a211efc
Merge pull request #9658 from spasticVerbalizer/bloodDripsAreNotSpecial
...
Stops humans from dripping blood while in lockers/bodybags
2015-05-30 00:31:02 -05:00
Cuboos
fcc18020a9
Wizard Sounds has the update. Been a bit since i've done a commit, so forgive me if i did this wrong. Also added the third title song, there a lot of agreement on what to do so i'll just add it as is, if a change needs to be made i'll do it later.
2015-05-29 20:29:37 -07:00
Razharas
5cdce1562e
Fixes russian ranged mobs being broken
...
Overriding new of mobs without calling parent is BAD BAD DONT DO THIS
2015-05-29 21:11:09 +03:00
Razharas
e13e6e8601
Merge pull request #9665 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome
...
Bugfix the anti-ninth
2015-05-29 15:21:51 +03:00
Cheridan
10f2b7ae00
Merge pull request #9559 from xxalpha/cardtrick
...
Card deck fixes and storage fixes.
2015-05-28 21:41:00 -05:00
spasticVerbalizer
89f5a5ee38
Makes track href not break on weird characters
2015-05-28 22:38:15 +02:00
spasticVerbalizer
679edcec16
'battered'
2015-05-28 22:09:13 +02:00
Jordie0608
6b524f09a9
eol fixes (probably) and examine fix in closets
2015-05-28 20:48:47 +10:00
spasticVerbalizer
07ee07e272
Changes 'bleeding' status in injury check to 'cut', 'my' to 'your'
2015-05-28 12:11:03 +02: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
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