Commit Graph

7439 Commits

Author SHA1 Message Date
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
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
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
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
Arokha Sieyes 1ad97486d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-030217sync
# Conflicts:
#	code/modules/organs/organ_icon.dm
2017-03-03 19:39:56 -05:00
Anewbe c831df104b Merge pull request #3041 from PolarisSS13/revert-3018-master
Revert "BlockHeadHair doesn't make players bald."
2017-03-03 18:29:46 -06:00
Anewbe 01109d3b8d Fixes the slowdown bug 2017-03-03 17:38:55 -06:00
Arokha Sieyes 79805c8cbe Adds *mlem and *awoo
YOU. MAKE. ME. ***SICK.***

That you somehow convinced me to do this.
2017-03-03 18:19:39 -05:00
Anewbe 81549fc965 Revert "BlockHeadHair doesn't make players bald." 2017-03-03 17:19:07 -06:00
Arokha Sieyes 97ca5c2542 Merge pull request #1062 from VOREStation/aro-030217sync
Polaris Sync
2017-03-03 14:29:40 -05:00
Arokha Sieyes 171ee67d99 Merge pull request #1068 from Screemonster/xenoiconandferal
more xenochimera tweaks
2017-03-03 14:28:10 -05:00
Screemonster 26cb63f7fc preview icon for xenochimera, fixes feral in stasis, raises shock threshold 2017-03-03 16:01:17 +00:00
JoanRisu 3785bd3700 ~Changes flag for squirrelkin language
~changes Joan's bag and its icon
+Adds Dhael's gun and permit to her spawnlist
~debug attempt on Crescent Rose's sprite changing code. Also changes sprites.
2017-03-03 03:39:00 -08:00
Arokha Sieyes 8ad568ae18 Merge pull request #1060 from VOREStation/aro-aivore
Adds AI Vore Capability
2017-03-03 00:27:06 -05:00
Arokha Sieyes a3e5e7327f Initial commit of new map system for Virgo 2017-03-02 23:34:43 -05:00
Arokha Sieyes 387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Spades 7b194cf09c Fixes broken dead alien icons 2017-03-02 22:04:39 -05:00
Arokha Sieyes c5c0af4f2f Adds AI Vore Capability
Also just general AI QOL things.

AIs have a "Hardlight Noms" verb in the Vore tab. When their hologram is on top of a person, they can pick this, and will homf them. Takes 5 seconds, neither of you can move or it cancels. Holograms with someone inside become almost opaque and purple. They also have different examine text.

A hologram with someone inside cannot move through glass/tables/etc. Pressing "Hardlight Noms" again will give the option of dumping the prey out. Derezzing the hologram will also do this. Also because the hologram can be 'blocked' by things now when full, moving the hologram off the screen will derez it and dump the prey too.

AIs can examine mobs now to get flavortext and OOC notes. Shift-click only. This is for annoying technical reasons. Sorry to those that like to right-click and click examine.
2017-03-02 21:54:19 -05:00
Anewbe a0198fb947 Merge pull request #3022 from VOREStation/infections
Infection code improvement
2017-03-02 19:54:26 -06:00
Anewbe 25b925f04c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Anewbe bb2adf1290 Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06:00
Leshana 3900225f53 Fix custom items appearing in random space turfs
* If a custom item can't be equipped to a character's inventory it is dropped on the ground.  For late join characters, equip_custom_item() was called before the mob was placed at their starting locations; their coordinates were still 1,1,1.   Which is the edge of a map so they get bounced to another z level.
* Fix: Equip custom items AFTER job_master.LateSpawn places the mob at the starting location, so it flows in same order as roundstart join characters.
2017-03-01 17:51:32 -05:00
Anewbe 8af4c2ba46 Merge pull request #3024 from Cameron653/master
Prevents halloss showing up as actual wounds on self examine
2017-03-01 15:03:44 -06:00
Neerti 813a61ef29 Merge pull request #3011 from Anewbe/simple_mob
Tasers can hurt simple mobs
2017-02-28 21:28:07 -05:00
Anewbe dc165906fa Merge pull request #3018 from nachomeep/master
BlockHeadHair doesn't make players bald.
2017-02-28 19:51:42 -06:00