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
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
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
def67decf8
Merge pull request #9693 from Razharas/MobFix
...
Fixes russian ranged mobs being broken
2015-05-31 14:28:25 -05:00
f4b4b34088
Prevents paper from burning multiple times
2015-05-31 11:37:23 -07:00
74ae1eca4d
Fixes paper burning from causing lag
...
By sleeping here, it froze the master controller for 7 seconds, at that point every subsystem would rapid fire to make up for the miss ticks.
2015-05-31 11:30:08 -07:00
f79e0fc1aa
Updates more paths, for example obj/stuff to /obj/stuff
2015-05-31 17:48:33 +02:00
03ab08112f
animated foam pistol shoots proper darts, no generic surgery, augmented eyesight gives nightvision and reagents in admincookie
2015-05-31 18:25:34 +10:00
84e8690ec6
merge conflict fix
2015-05-31 02:45:46 +02:00
3a826fe13c
Changes alot of datum/ to /datum/
2015-05-31 02:40:54 +02:00
b36b4f4e00
Makes the giant spider verbs not work if dead.
2015-05-30 23:27:27 +02:00
c9eee03e71
Namepart instead of M.name
2015-05-30 18:00:08 +02:00
6dd413c99f
Merge branch 'master' of https://github.com/tgstation/-tg-station into PrinterFix
2015-05-30 17:27:43 +03:00
6f1a705777
Fixes imprinter volume with beakers
...
Fixes imprinter volume with beakers
2015-05-30 17:23:39 +03:00
3c4f5f46f0
More track hrefs + fix for tcs issue
2015-05-30 12:06:34 +02:00
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
af89c59ed0
Lowers Armor Values
...
At some point someone changed the armor system to always block, which I
understand, because RNG is annoying, but they didn't lower the armor
values to compensate.
Right now a basic security officer blocks 50% of all melee damage. It
would take 7 hits from an esword/punches from a Juggernaut to reliably
down an officer, and just a single stun baton to down a guy with an
esword.
It takes 20 hits from an inactive baton to crit a basic officer, 8 hits
from an arblade, etc.
In short, melee is completely awful as soon as someone throws on a basic
vest. It makes melee weapons impossible to balance because even if
they're strong enough to crit a random med doctor in 4 hits they're limp
noodles vs a helmet. We can't move away from "I stun you lose" combat if
stun weapons are 8-20 times as effective as anything else.
I lowered the values around half for melee and tweaked laser resist a
bit as well (again, it shouldn't take 10 lasers to down someone vs their
one taser). I'm not overly attached to these values, nor are they
particularly deeply thought about, I just wanted to get a conversation
on git started where everyone would see it.
2015-05-29 23:34:07 -05:00
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
97990c94cc
Changes how destroying turfs works
...
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.
Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).
Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).
Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.
Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.
I should have done this years ago for away missions.
Also added myself to admins.txt
2015-05-29 18:43:34 -05:00
662af7174f
Merge remote-tracking branch 'upstream/master' into fixfixfix
...
Conflicts:
icons/obj/storage.dmi
2015-05-29 21:45:18 +01:00
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
c58142d394
Stability fix
2015-05-29 19:42:41 +02:00
e13e6e8601
Merge pull request #9665 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome
...
Bugfix the anti-ninth
2015-05-29 15:21:51 +03:00
10f2b7ae00
Merge pull request #9559 from xxalpha/cardtrick
...
Card deck fixes and storage fixes.
2015-05-28 21:41:00 -05:00
89f5a5ee38
Makes track href not break on weird characters
2015-05-28 22:38:15 +02:00
679edcec16
'battered'
2015-05-28 22:09:13 +02:00
6b524f09a9
eol fixes (probably) and examine fix in closets
2015-05-28 20:48:47 +10:00
07ee07e272
Changes 'bleeding' status in injury check to 'cut', 'my' to 'your'
2015-05-28 12:11:03 +02:00
4fd2c24ca5
zeroth laws can be removed with core boards
2015-05-28 19:38:06 +10:00
b310811fdd
reverts removing protectstation and clearing zeroth law
2015-05-28 19:13:30 +10:00
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
3b75f04cb7
Autolathe Destination Tagger and Hand Labeler
...
Adds Destination Tagger and Hand Labeler to autolathe.
2015-05-27 12:49:36 -05:00
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
e82c02744e
paerbin clickdown, removed protectstation, rounded ui chem/plasma count, non-mob hivebot beacon
2015-05-27 16:54:13 +10:00
0cafaf9373
zeroth laws can be removed with core boards
2015-05-27 12:09:09 +10:00
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
068afd71cc
Merge pull request #9574 from RemieRichards/NewDroneSkin
...
New Drone Skin
2015-05-26 14:27:56 -05:00
a5c943f19c
Merge pull request #9598 from Jordie0608/mfwtortoisegitrefusedtobelievethereweremergeconflicts
...
Fixes #7767 , Readds shuttle areas for teleporting
2015-05-26 14:17:40 -05:00
db5b79d0a6
Stops humans from making blood drops while in lockers/bodybags
2015-05-26 20:15:56 +02:00
c4254a727d
Merge pull request #9638 from CosmicScientist/EnglishFixes
...
Fixed some general spelling and grammar
2015-05-26 03:53:37 -05:00
af31d8d255
Merge pull request #9639 from SconesC/pins-typo
...
Fixes Clown/DNA pin typo, updates descriptions
2015-05-26 02:32:21 -05:00
dac0ee17e7
Merge branch 'master' of https://github.com/tgstation/-tg-station into mfwtortoisegitrefusedtobelievethereweremergeconflicts
2015-05-26 15:10:30 +10:00
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
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
373c72773f
Merge pull request #9617 from Miauw62/maniasureamgoodatcomingupwithgooddescriptivebranchnamesdontyouthinksobecausethisbranchnameisverygoodanddescriptive
...
Makes all machines use the robot font.
2015-05-25 18:31:15 +01:00
d97da2d9d4
Merge pull request #9590 from xxalpha/memech
...
Fixed Changeling Revival
2015-05-25 18:29:51 +01:00
c5a2c5d396
Merge pull request #9572 from Aranclanos/stealthAdminPM
...
Fixes admin-PM on stealth
2015-05-25 18:28:32 +01:00
61c0ddebbb
Merge pull request #9553 from AnturK/probing_fan_club
...
Adds abductees to check antags panel
2015-05-25 18:14:10 +01:00
20a28f7d9e
Fixes poppyseed mutating into tomato seeds instead of geranium/lily
2015-05-25 14:48:14 +02:00
a7a5a9acda
Merge pull request #9543 from Aranclanos/astar
...
AStar fixes
2015-05-25 06:24:36 -05:00
Cheridan
MrStonedOne
Firecage
Jordie0608
spasticVerbalizer
Razharas
KorPhaeron
Cuboos
xxalpha
AnturK
Razharas
GunHog
Remie Richards
Incoming
phil235