Commit Graph

7461 Commits

Author SHA1 Message Date
Arokha Sieyes
878a250dc4 Readds Akula blood color 2017-03-18 01:16:03 -04:00
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Leshana
f3a6678389 Fix another runtime when trying to respawn before roundstart.
* If you observe, then want to respawn before the round starts, it runtimes.  Lets prevent this.
2017-03-17 00:49:19 -04:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Neerti
c91c8dc177 Makes the mention system more robust on name detection.
Changes * to + for bolding.
2017-03-14 15:45:55 -04:00
Arokha Sieyes
9a8b0911c6 Angel and Demon languages
Not actually MAGICAL angels and demons, I believe, just they resemble them and are spacefaring races and so sometimes end up matching various religious texts in terms of appearance and habit.

Can we please stop adding whitelisted languages? It's dumb. We have ONE person whitelisted for gutter, and a lot of good it does them since nobody else has even applied. They'd have to talk to someone with a translator.
2017-03-13 12:45:03 -04:00
Arokha Sieyes
0bb3a71625 Merge pull request #1169 from VOREStation/aro-newpolsync
Polaris Sync
2017-03-13 01:50:11 -04:00
Arokha Sieyes
6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29:01 -04:00
Arokha Sieyes
01edd04bc5 Add several new foods
Sushi, Lasagne, Wings, Doner Kebab, Reishi's Cup, Hot&Sour Soup, General Tso's, Kitsune Udon, Goulash, Roast Beef

Also made it so synths don't have reduced taste. You can just RP it however you want, I'd rather let them see the info about flavor and if you want to RP that you have low quality taste 'sensors' then so be it.
2017-03-13 00:36:34 -04:00
Anewbe
a1b90a0411 Merge pull request #3080 from Neerti/3/10/2017_i_hate_byond_regex
Adds Two QOL Say/Emote Features
2017-03-12 19:48:18 -05:00
Anewbe
ecc5b13908 Merge pull request #3076 from Leshana/handcuffs-hud
Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed.
2017-03-12 19:24:56 -05:00
Neerti
11b1185005 Adds Two QOL Say/Emote Features 2017-03-12 09:30:48 -04:00
Arokha Sieyes
4c0e330140 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync 2017-03-11 18:47:17 -05:00
Leshana
baf8e2d143 Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed.
We define the inventory screen objects for hands to be special in that apply overlays to themselves for handcuffed.  By putting that logic on the screen object itself, we allow it to be expanded to other cases besides handcuffs in the future without conflict.
2017-03-10 22:06:05 -05:00
Anewbe
e4fe4256b7 Merge pull request #3066 from Neerti/3/9/2017_wet_skrell_are_liars
Skrell/Tesh Examination Change
2017-03-10 20:53:53 -06:00
Yoshax
d98fcfcc14 Adds pike, weak pike and strong carp, also adds them to the belt mining lists 2017-03-11 02:40:18 +00:00
Mechoid
467cea8a00 Multi-sprite Panel updoot. 2017-03-09 22:54:44 -08:00
Neerti
9167156db5 Skrell/Tesh Examination Change
Examining a Skrell/Teshari while not a member of the same species will obscure the Skrell/Teshari's gender, to better reflect lore.
Ghosts, and silicons (AIs/borgs) are exempt from this.
2017-03-09 02:44:23 -05:00
Arokha Sieyes
ef69742a1c REALLY right-side talk icons
I see the 'just talked' one flips back over.
2017-03-08 19:59:29 -05:00
Arokha Sieyes
4712a9c49a Merge pull request #1137 from VOREStation/aro-pets
Fix befriending pets
2017-03-08 18:28:38 -05:00
Arokha Sieyes
bc3e4291c3 Fix befriending pets
Fixes Runtime and Renault's expected job titles for being befriended.
2017-03-08 18:03:04 -05:00
Anewbe
59a75f37a2 Merge pull request #3026 from Yoshax/ghoststuff
Cleans up, fixes, and improves ghost teleporting
2017-03-08 10:58:36 -06:00
Arokha Sieyes
01a2ae7850 Merge pull request #1121 from VOREStation/sync-2017-03-06
Polaris Sync
2017-03-07 03:40:27 -05:00
Arokha Sieyes
05f7002950 Swap typing indicator to right side
With the common availability of AR glasses, this is super annoying to have it always under the job ID.
2017-03-07 00:53:21 -05:00
Leshana
12ab0e4da2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 2017-03-06 22:46:28 -05:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Neerti
9b13c7367c Merge pull request #3057 from Anewbe/tails
Edits Taj and Unathi tail sprites
2017-03-06 19:02:58 -05:00
Anewbe
132d9a7611 Edits Taj and Unathi tail sprites 2017-03-06 14:41:06 -06:00
Anewbe
13d161565e Merge pull request #3055 from VOREStation/missinghud
Add TOTAL_HUDS define
2017-03-06 13:51:01 -06:00
Arokha Sieyes
dea94be3f2 Make more things eat each other 2017-03-06 01:59:00 -05:00
Arokha Sieyes
da6d873ba4 Forgot the syndiresting 2017-03-06 01:51:30 -05:00
Arokha Sieyes
0d9bdb9c46 Adds more foxing
Adds the captain's fox pet back in, adds resting sprites for foxes and the dastardly syndifox.
2017-03-06 01:49:28 -05:00
Arokha Sieyes
e65ef1b0d6 Add TOTAL_HUDS define
Making a list just... 'be 10 long' is bad. Like update_icons layers and various other things, if you add more, it will compile fine and then you get runtimes later, which is a little annoying. Having places you just have to 'know' to update elsewhere in the code is meh.
2017-03-06 01:07:46 -05:00
Arokha Sieyes
ce01659ae1 Adds a console to medical, engineering, security AR glasses
Crew monitor, alerts console, other alerts console
2017-03-06 00:33:08 -05:00
Arokha Sieyes
c7857a5bf3 Improves AR glasses, makes them available
Now you can start with them in loadout. They are no longer SUNglasses though, so they won't protect you from flashes.

There are several models, the loadout ones are the civilian ones.

- Civilian: Displays job ID icon based on the person's ID, and shows a health bar only if they are injured.
- Medical: Same as civlian, but displays advanced status (virus, borer, etc) along with backup implant status, and allows medical records access.
- Security: Same as civilian, but displays warrant and arrest status, and will automatically darken (electrochromic) in response to flashes, making the wearer immune, plus security records access.
- Engineering: Same as civilian, but will automatically darken to protect one's eyes during welding.
- Research: Same as civilian, but has a trendy goggle form factor for SCIENCE reasons.
- Omni: Has the combined features of all of the above. The only pair available spawns in the CD's office. (CC officers also)
2017-03-05 20:58:59 -05:00
Yoshax
45af122441 forcemove 2017-03-05 23:58:17 +00:00
Arokha Sieyes
ebf50d073a Add TOTAL_HUDS define
Making a list just... 'be 10 long' is bad. Like update_icons layers and various other things, if you add more, it will compile fine and then you get runtimes later, which is a little annoying. Having places you just have to 'know' to update elsewhere in the code is meh.
2017-03-05 18:42:24 -05:00
Anewbe
05e6ef5ad8 Merge pull request #2988 from Anewbe/boots
Boots are now a subtype of shoes
2017-03-05 14:13:47 -06:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Arokha Sieyes
0937ee103d Further tweaks flip chances
Eh 2% may have been a bit overboard.
2017-03-04 22:10:30 -05:00
Arokha Sieyes
9f1db703d2 Message tweaks. 2017-03-04 21:24:40 -05:00
Arokha Sieyes
f36d52043c Raise *flip trouble chances slightly
Also make synth limbs fly off because they can't break. Wouldn't want them to be left out of the fun.
2017-03-04 21:18:54 -05:00
Arokha Sieyes
0a1f86594c Remove a world.log reference
Left this in. Wouldn't have printed to anyone since it's world.log not world, but still shouldn't be there.
2017-03-04 19:08:31 -05:00
Arokha Sieyes
89e42fc255 Improves *flip
Yessss. Yesssssssssss.

Base 1% chance to break a leg or foot.
+1% for taurs
+2% for any missing part
Can't flip if you don't have one full leg/foot or two legs w/o feet (aka you need at least 2 parts from lleg+rleg+lfoot+rfoot)
2017-03-04 18:31:16 -05:00
Arokha Sieyes
4f06a18057 Dragor fluff items, Aronai fluff item fixes
Also fixes *flip to not print an error message (emotes must have messages that they display) and redoes how vials start with reagents to make it easier to code them. Also swapping genders as a promethean won't randomize your hair anymore. That was silly, and relevant to Dragor's thing.
2017-03-04 16:04:43 -05:00
Poojawa
780c1f9973 Backflips are back in style 2017-03-04 04:57:01 -06:00
Arokha Sieyes
ecff631973 Let's prometheans learn an extra language
Fixes #1021

I dunno how many would be fair, but I don't think anyone will argue with just adding one.
2017-03-04 00:27:41 -05:00
Arokha Sieyes
e779b9b59d Renames mlemawoo proc
There already was an emote_vr y'see. And this broke subtle.
2017-03-03 21:58:38 -05:00
Arokha Sieyes
47e1a079b1 Merge pull request #1077 from VOREStation/aro-030217sync
Emerg Revert
2017-03-03 19:52:34 -05:00
Arokha Sieyes
d345d74974 VS revert 2017-03-03 19:49:02 -05:00