Commit Graph

14293 Commits

Author SHA1 Message Date
Arokha Sieyes
28ccc4f21c Yeah, that's a typo. 2016-05-26 16:21:11 -04:00
Arokha Sieyes
8e21e09d23 Yeah, that's a typo. 2016-05-26 16:17:23 -04:00
GinjaNinja32
beee32f237 Allow disabling styling of fake nanoui windows 2016-05-26 18:07:38 +01:00
Arokha Sieyes
76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
2016-05-26 09:59:18 -04:00
Datraen
4448a6f469 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/modules/mob/living/say.dm
2016-05-26 08:20:41 -04:00
Yoshax
77ee2215e7 Removes unused and unnecessary spam prevention 2016-05-26 04:24:18 +01:00
Leshana
3caec84482 Fix copy/paste error duplicating definition 2016-05-25 23:12:56 -04:00
Datraen
6df5e33e36 Merge pull request #1745 from VOREStation/fixvision
Followup to blindness fix
2016-05-25 21:37:07 -04:00
Leshana
e37ac4da3e Fixes #145 - Makes jukeboxes constructable.
* Adds circuit board.
* Adds design to print board on autolathe.
* Makes jukeboxes deconstructable back to frame.
2016-05-25 21:35:24 -04:00
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
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
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
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
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
Arokha Sieyes
4b582f55ef Gave cyborgs a little more power
Not a ton, but some. They're still super-powerful so.
Fixes #209
2016-05-23 23:04:40 -04:00
Arokha Sieyes
235879208b Increases dogborg digestion time by 30% give or take
Fixes #210
2016-05-23 23:00:48 -04:00
Yoshax
eaee6b7af9 Ensures special role returns true non-gamemode antags 2016-05-24 02:04:08 +01:00
Leshana
a325940040 Adds preference to mute remote LOOC chatter heard by admins.
* Lets people remain on standby for adminhelps without having all that spam scrolling stuff off the screen if they are not taking on the role of policing LOOC.
2016-05-23 20:36:22 -04:00
SinTwo
ba4fa36984 Adds UI and a few fixes 2016-05-23 17:59:41 -04:00
Spades
38e0c6eb39 Merge pull request #181 from Cameron653/master
Better xenoarch laser gun sprite
2016-05-23 16:31:19 -04:00
Yoshax
02fa5585c5 Fixes loadout skirts all spawning as black skirts 2016-05-23 19:35:13 +01:00
Cameron653
36ef5e381c Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-05-23 14:06:08 -04:00
Cameron653
f7c7b5eb3a Removes pay bugfix 2016-05-23 14:06:06 -04:00
Cameron653
96b165ca6c Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-05-23 14:02:50 -04:00
Yoshax
eaf0e1e4dd Fixes #175 2016-05-23 18:07:36 +01:00