Commit Graph

16142 Commits

Author SHA1 Message Date
Arokha Sieyes a9db9fa4e2 More bug fixes for bug fixes 2017-03-09 00:21:44 -05:00
Arokha Sieyes 9780ccba31 Fix two minor bugs
Wrong access on an airlock, and translocator televore when used to eat people yourself.
2017-03-08 22:34:33 -05:00
Arokha Sieyes adb28b055a Merge pull request #1139 from VOREStation/aro-flip
Now in disease form
2017-03-08 21:13:36 -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 ca2ef4c3fe Now in disease form
A disease that makes you flip!
2017-03-08 19:52:55 -05:00
Arokha Sieyes fa59590019 Merge pull request #1135 from VOREStation/aro-adminbus
WIP Event ship and smaller shuttle
2017-03-08 18:28:55 -05:00
Arokha Sieyes e52a5afa60 Merge pull request #1136 from VOREStation/aro-translocator
Personal Translocator
2017-03-08 18:28:48 -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 0b8460f159 Merge pull request #1126 from Yoshax/tails
Adds vulpankin tail to tail selection and updates taj and munathi to atch species files
2017-03-08 18:04:40 -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 97fcdd5cd7 Personal Translocator
Adds it to science. Has a high materials and research cost, and is considered ***contraband***, as it says in the description.

Also included in this PR is device_alt.dmi, a bunch of alternate device sprites which can be fun for stuff.
2017-03-08 18:01:35 -05:00
Arokha Sieyes 80e513657c WIP Event ship and smaller shuttle
WIP on Virgo-2.dmm, Joan must help finish it :O
2017-03-08 17:57:29 -05:00
Leshana b0a6dfd58a Supply Demand event cleanup
* Improved the ending messages to be more fluffy and descriptive.
* Scaling bonus cargo points if win.
* Bugfixes for ending conditions and removing extra debugging systems.
* Move comments because indentation awk script gets confused.
2017-03-08 13:34:11 -05:00
Yoshax 5a6c020b16 Adds vulpankin tail to tail selection and updates taj and unathi to match species files 2017-03-08 02:41:46 +00:00
Leshana b289360eb7 Upgrade Supply Demand event to take department activity into account. 2017-03-07 18:40:45 -05:00
Leshana fbe46b7df4 Added Supply Demand Event
* Yes, its an event where CentCom asks you to actually do something useful and make stuff.  You put it on the shuttle to win.
* It has something for most departments.  So far there are seven categories of items it requests:
 * Researched items (From protolathe etc)
 * Food Items
 * Chemistry Reagents
 * Drinks
 * Metals
 * Gas Mixtures
 * Mecha
2017-03-07 18:40:45 -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 8006edee57 Merge pull request #1122 from VOREStation/aro-talkswap
Swap typing indicator to right side
2017-03-07 01:50:20 -05:00
Arokha Sieyes 8f0d7656e8 Merge pull request #1120 from VOREStation/aro-telenoms
Nerf Vore
2017-03-07 00:54:39 -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
Neerti 04e38f8e26 Merge pull request #3059 from Anewbe/custom_item_check
Adds a check for custom items
2017-03-06 22:43:49 -05:00
Anewbe 44cd464941 Adds a check for custom items 2017-03-06 21:25:54 -06:00
Leshana a5a805414b Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not.  The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05:00
Leshana 17c74c17fc Updated our custom items and maps to account for the path changes for boots! 2017-03-06 21:46:35 -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
Arokha Sieyes e1f5010820 Nerf Vore
Gosh. So robust.

Actually fixes vore so that it doesn't teleport people into your stomach even if they move away. When did that become a thing?
2017-03-06 16:00:38 -05:00
Anewbe 132d9a7611 Edits Taj and Unathi tail sprites 2017-03-06 14:41:06 -06:00
Arokha Sieyes 233dca23fd Display OOC notes on mind and body records 2017-03-06 15:09:55 -05:00
Anewbe 13d161565e Merge pull request #3055 from VOREStation/missinghud
Add TOTAL_HUDS define
2017-03-06 13:51:01 -06:00
Arokha Sieyes abf2e8af69 Resleeving tweaks, fix compile warning
Resleeving console now lists people in alphabetical order, and removes bodies when the person cryos (as long as they were really in that body, you can't cryo someone's printed body w/o resleeving and have it remove them)
2017-03-06 14:22:11 -05:00
Arokha Sieyes 4fe9761ac3 Merge pull request #1115 from VOREStation/aro-circuithypolog
Less hypo logs
2017-03-06 03:10:48 -05:00
Arokha Sieyes 648aab61b9 Merge pull request #1114 from VOREStation/aro-hudbetter
Remove an errant button, fix fluff glasses
2017-03-06 03:10:33 -05:00
Arokha Sieyes c376031863 Less hypo logs
Fixes #1113
2017-03-06 02:53:15 -05:00
Arokha Sieyes 0ac9497102 Remove an errant button, fix fluff glasses
Another fluff glasses fix after Kisuke's and Tempest's. Somehow forgot my own, and didn't fix Kisuke's all the way. On-mob sprite was normal glasses.
2017-03-06 02:50:50 -05:00
Arokha Sieyes 860049ec30 Merge pull request #1110 from Poojawa/ds9-uniforms
DS9 overcoat hotfix
2017-03-06 02:29:03 -05:00
Arokha Sieyes 7b6be61523 Merge pull request #1109 from VOREStation/aro-hudbetter
Fixes two fluff glasses
2017-03-06 02:09:36 -05: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
Poojawa b4f168bafc how the blood heck did this dropped? 2017-03-06 00:26:27 -06:00
Arokha Sieyes 2e4bbe7e5d Fixes two fluff glasses
Koos and Temp
2017-03-06 01:22:10 -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 0e01492467 Merge pull request #1107 from VOREStation/aro-hudbetter
Improve AR glasses
2017-03-06 00:43:06 -05:00
Arokha Sieyes 8fe74341d9 Merge pull request #1106 from JoanRisu/Fluff_Items_worshop
64x32. Oh dear, that is rather long.
2017-03-06 00:40:49 -05:00
Arokha Sieyes 2d46984bd2 Small fix! 2017-03-06 00:39:52 -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
JoanRisu 997623c2da Adds some 64x32 two-handed gun sprites to the code. 2017-03-05 15:43:41 -08:00