Commit Graph

23440 Commits

Author SHA1 Message Date
PsiOmegaDelta
b31e6cf757 Fixes #12131.
Blindness/deafness now check the correct disability var (we have two for some reason, very practical).
2016-05-25 21:28:31 -04:00
Datraen
f0edb66f9b Merge pull request #1741 from VOREStation/sayupgrade
Say/Whisper Rewrite
2016-05-25 21:17:36 -04:00
Yoshax
cfa8db6097 Merge pull request #1743 from VOREStation/fixvision
Fixes NEARSIGHTED = BLIND
2016-05-26 02:09:45 +01:00
Arokha Sieyes
487bb7cf96 Fixes ancient typo 2016-05-25 21:01:52 -04:00
Yoshax
87a7cfcbac Merge pull request #1742 from Serithi/Lavender
Apparently i added the seeds to the wrong seed vendor file.
2016-05-26 01:54:30 +01:00
Serithi
c4df745933 Better formatting. 2016-05-25 17:45:48 -07:00
Serithi
b7158b5acd Apparently i added the seeds to the wrong seed vendor file. Hoooopefully this is all that's needed now. 2016-05-25 17:24:22 -07:00
Arokha Sieyes
1fed239264 Done w/ testing, block spam again. 2016-05-25 19:51:53 -04:00
Arokha Sieyes
9783848717 Don't forget dead people 2016-05-25 19:26:15 -04:00
Arokha Sieyes
6c04110805 Allows silicons to whisper (mostly used by borgs but I guess an AI could whisper into a radio). 2016-05-25 18:28:11 -04:00
Yoshax
3b23d1670f Finishes the dnalock framework 2016-05-25 22:20:10 +01:00
Datraen
3b72b362d7 Fixes #530 2016-05-25 17:11:36 -04:00
Arokha Sieyes
4588498486 Worked Whisper into Say
It was annoying. And hard. But it's done.

For the most part anyway.
2016-05-25 16:59:47 -04:00
Serithi
74f72c8e25 Adds in lavender. Doesn't need much nutrient or water (assuming i did the numbers right, feel free to fix them if i did a dumb), contains a small amount of bicard, and is purple. What more could one want from a flower? 2016-05-25 13:08:33 -07:00
HarpyEagle
2aa0e29ae6 Fixes get_turf() runtime 2016-05-25 15:19:58 -04:00
Datraen
349251e55f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/obj/weapons.dmi
2016-05-25 15:09:23 -04:00
Datraen
22a69471c8 Merge pull request #1737 from Yoshax/cheekysuitsensor
Makes suit sensors produce a message when changed and generalizes message
2016-05-25 15:03:46 -04:00
Yoshax
80434f41a6 Makes suit sensors produce a message when changed and generalizes message 2016-05-25 19:42:26 +01:00
Datraen
85f3dc84e4 Adds component requirements, adds tech levels, fixes copy error. 2016-05-25 14:40:55 -04:00
HarpyEagle
dd9082f903 get_turf optimization
Checks isturf() and then locs instead of looping
2016-05-25 14:15:31 -04:00
Datraen
9e09720be5 Final Initial Implementation of Xenobio2 System.
Kinks worked out, everything is functioning as it should.
2016-05-25 14:11:37 -04:00
Yoshax
9b8aefed5b Adds towels 2016-05-25 18:38:16 +01:00
Datraen
79e22d58e5 Semi-final stage of Xenobio2 Initial Implementation
Adds UIs to Core Extractor, Slime Replicator
Adds Slimified Monkey Cubes as separate item type
Adds Docility Toxin
Replaces amutationtoxin references with docilitytoxin references
Adds resistances to simple_mob damage handling, to allow for simple mobs to have resistances to different kinds of damage
Moves a return to it's proper position to allow for hostile mobs to properly handle targets.
2016-05-25 03:50:23 -04:00
HarpyEagle
652e35024b Allows only one adverb when whispering 2016-05-25 00:48:57 -04:00
HarpyEagle
3347f97b5d Merge HarpyEagle remove speech problem flags 2016-05-25 00:48:02 -04:00
HarpyEagle
153cfaa5b4 Removes unused ninja speak 2016-05-25 00:46:14 -04:00
HarpyEagle
8bc2e4d88b Merge HarpyEagle commit 2016-05-25 00:43:46 -04:00
HarpyEagle
2bb73a3861 Fixes bad default whisper_verb
Doesn't do anything other than cause the text "whispers" to be used for pretty much
every other language even when it should not be.
2016-05-25 00:26:14 -04:00
Arokha Sieyes
4f230aba7c Further tweaks say.dm 2016-05-25 00:13:59 -04:00
Ccomp5950
3f2c95cfff Merge d3081d97ac3bd438fb2331b5aaeb40dadeaf5049 2016-05-25 00:05:37 -04:00
Datraen
43be60c262 Merge pull request #1734 from Yoshax/bugfixes
Removes unused xeno stuff + a bug fix
2016-05-24 22:30:52 -04:00
Datraen
49a83f293f Merge pull request #1732 from VOREStation/lessthanthreeyosh
Fixes two issues
2016-05-24 22:29:57 -04:00
Yoshax
6ff7293585 Removes unused Xeno stuff 2016-05-24 23:48:52 +01:00
Arokha Sieyes
156ad00d49 Fixes #1714
Removes duplicate code, and fixes the logic of the original code that was supposed to perform the same function, but did not, due to bad if-statement logic. Performed eye removal, and eye transplant to test. I would have liked to have fixed the flat `blinded = 0` at the top of the file, but it's so ingrained in how it works now, I could not.
2016-05-24 13:12:08 -04:00
Arokha Sieyes
2e263ffc07 Fixes #1655
Don't snowflake one mode with new(). Setting this on new() causes
weirdness when new() is called (prints unexpected messages to players
about the mode being toggled). If you really want it, define the var as
equal to the bitflag in the definition and update the starting human HUD
to match. Don't change it 'after' if that's always how you want it.
2016-05-24 12:12:26 -04:00
Yoshax
eaee6b7af9 Ensures special role returns true non-gamemode antags 2016-05-24 02:04:08 +01:00
SinTwo
ba4fa36984 Adds UI and a few fixes 2016-05-23 17:59:41 -04:00
Yoshax
02fa5585c5 Fixes loadout skirts all spawning as black skirts 2016-05-23 19:35:13 +01:00
Neerti
3484d3c3d3 Merge pull request #1727 from Anewbe/guestpass
Ups guestpass max time to 2 hours
2016-05-22 21:52:48 -04:00
Anewbe
455c774aa7 Ups guestpass max time to 2 hours 2016-05-22 20:08:08 -05:00
Datraen
96be57d787 Merge pull request #1720 from Anewbe/hardsuit_slowdown
Hardsuit Slowdown fix
2016-05-22 19:23:30 -04:00
Datraen
864ffc8f24 Merge pull request #1724 from Anewbe/removes_horsehead
Removes 2 spells from wiz until we get NewWiz (*COUGH NEERTI COUGH*)
2016-05-22 19:22:07 -04:00
Datraen
6af9bee876 Merge pull request #1723 from Yoshax/loadoutfixes
Replaces instances of Xenobotanist in loadout with Xenobiologist
2016-05-22 19:21:46 -04:00
Anewbe
d2b43bd5a4 Prevents the Robocalypse 2016-05-22 14:51:35 -05:00
Yoshax
2f73167f39 Fixes chocolate milk seeming like milk in a glass 2016-05-22 18:56:53 +01:00
Anewbe
9e7676cc17 Removes Horsehead and Mindswap from Wizard spellbooks 2016-05-22 11:38:09 -05:00
Yoshax
8f7288473a Adds a framework for dna-lockable guns (unfinished) 2016-05-22 17:16:45 +01:00
Yoshax
334a0238ae Replaces instances of Xenobotanist in loadout with Xenobiologist 2016-05-22 14:22:47 +01:00
Spookerton
9d250e4062 Merge pull request #1716 from Anewbe/warden_armor_tweaks
Warden Jacket protects legs
2016-05-22 11:22:48 +01:00
Anewbe
5c0a4215a2 Moves all slowdown for Hardsuits to the backpack 2016-05-21 21:43:40 -05:00