Commit Graph

6798 Commits

Author SHA1 Message Date
Arokha Sieyes
28ccc4f21c Yeah, that's a typo. 2016-05-26 16:21:11 -04: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
Yoshax
77ee2215e7 Removes unused and unnecessary spam prevention 2016-05-26 04:24:18 +01:00
Datraen
6df5e33e36 Merge pull request #1745 from VOREStation/fixvision
Followup to blindness fix
2016-05-25 21:37:07 -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
Arokha Sieyes
487bb7cf96 Fixes ancient typo 2016-05-25 21:01:52 -04: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
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 d3081d97ac 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
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
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
Spades
9797c3882a Merge pull request #195 from VOREStation/Dev-AceMobs
Fixes large vore mob alignment, and also Ghost alert
2016-05-23 08:16:54 -04:00
Spades
bbc70d1bd9 Ghost alert prompt no longer lies 2016-05-23 01:16:14 -04:00
Spades
d5710556a8 Faction wasn't correct! 2016-05-23 00:50:22 -04:00
Spades
1f24969d44 Tweak 2016-05-23 00:36:58 -04:00
Spades
0f36302739 Merge remote-tracking branch 'refs/remotes/origin/master' into Dev-AceMobs 2016-05-23 00:36:22 -04:00
Spades
baaf3b2335 Fixes #178 2016-05-23 00:36:12 -04:00
Spades
8c23ad27dc Fixes #192 2016-05-22 23:43:08 -04:00
Spades
76ea210f55 Merge remote-tracking branch 'refs/remotes/origin/master' into dev-Ace 2016-05-22 22:50:36 -04:00
Spades
39bc0b7df0 Merge pull request #190 from VOREStation/dev-Ace
Revert skin tone change
2016-05-22 22:50:17 -04:00
Spades
95ef0597e4 Reverts skin tone change 2016-05-22 22:36:41 -04:00
Spades
3e5784316e Revert "Reverts skin tones"
This reverts commit 8b3eab78d4.
2016-05-22 22:35:23 -04:00
Spades
8b3eab78d4 Reverts skin tones 2016-05-22 22:34:57 -04:00
Leshana
45889ae113 Fixes Issue #165 - Now will eat until completely full, not until almost full. 2016-05-22 22:10:23 -04:00
Spades
b616e5bcdc Fixes #166
Problem solved by moving the vore alien mobs under vore.dmi and fixing
the icon states. My fault for making this screwy in the old code to
begin with.
2016-05-22 16:17:16 -04:00
Arokha Sieyes
7b0441ee04 Merge pull request #171 from VOREStation/zerotwo
Fixes for v1.02
2016-05-22 16:09:05 -04:00
Cameron653
31d53b8054 Adds in the "Subtle" command. (#173)
* This should add in subtle

* Subtle WIP

* WIP

* Adds in subtle verb.

* Adds in some coder comments saying

Where the parts would normally go
2016-05-22 12:12:06 -04:00
Arokha Sieyes
73143c4fd6 Fixes #163 2016-05-22 02:18:44 -04:00
Arokha Sieyes
45dc312001 Adds SSD/ghost and idle time to examine text
Ghost timer displays immediately upon ghosting. Idle timer displays after 10 minutes of client inactivity. Helpful to know when someone needs to be cryo'd.

`[Disconnected/ghosted 11 minutes ago]` <-- client dropped and probably ain't comin' back.
`[Inactive for 18 minutes]` <-- fell asleep at keyboard
2016-05-22 02:16:15 -04:00
Arokha Sieyes
79e431ce04 Fixes #172 2016-05-21 23:48:39 -04:00
Arokha Sieyes
8595111251 Correct iconstates on some other alien types.
#166
2016-05-21 23:35:35 -04:00
Arokha Sieyes
11064b8ea8 Removes comments to make PR for Polaris. 2016-05-21 22:49:29 -04:00
Arokha Sieyes
592d17a145 Make whispers work inside objects/people 2016-05-21 20:37:01 -04:00
Arokha Sieyes
adace754f0 Merge pull request #124 from VOREStation/heatfix
Initial Simple Fixes
2016-05-21 13:20:12 -04:00
Arokha Sieyes
803dff61f3 Fixes #134 2016-05-21 12:32:21 -04:00
Arokha Sieyes
232dd87922 Fixes #133
Removes reagent tag so reagents treat them as humans.
2016-05-21 11:49:45 -04:00
Spades
4c64da73be Spawn timer fix
Resolves #123
2016-05-21 11:30:48 -04:00
Arokha Sieyes
61d90a6c75 Species heat/cold messages, allows prometheans 2016-05-21 00:06:56 -04:00