Commit Graph

25900 Commits

Author SHA1 Message Date
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
nachomeep
59a592fd34 minor delay adjustment 2017-03-07 16:13:19 -05:00
nachomeep
eaba140555 adds delay to sounds 2017-03-07 16:11:38 -05:00
nachomeep
72d54925d5 enables photocopier sounds 2017-03-07 15:16:57 -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
Neerti
fc75357c61 Merge pull request #3054 from Anewbe/healthscanner
Oxyloss shows as cyan
2017-03-06 18:59:27 -05:00
nachomeep
afcd662beb turns all phoron purple 2017-03-06 17:54:40 -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
079a5e787e Merge pull request #3056 from Leshana/supply-shuttle-hook
Adds Supply Shuttle Hook
2017-03-06 13:55:25 -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
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
Leshana
8355428e4e Adds Supply Shuttle Hook
* Adds a global hook for when the supply shuttle reaches centcom.  The existing sell_crate hook is too limited, as it only detects what is in crates, and is fired many times, making it hard to produce a summary for events that might want stuff shipped on the shuttle.
2017-03-06 12:36:19 -05:00
Arokha Sieyes
9e1daf2081 Merge pull request #1116 from VOREStation/aro-paste
Makes nanopaste useful externally
2017-03-06 09:24:18 -05:00
Arokha Sieyes
d6e0709fd0 Whups 2017-03-06 03:15:07 -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
4a768f8594 Makes nanopaste useful externally
Welders and wires repair 15 of brute and burn respectively, this only repairs 5 of both. So you can do it a lot faster with a welder/wires, but you can carry a nanopaste with you to fix that time you hit yourself with a box or something. Quick fieldwork w/o goggles and such.

Fixes #1105
2017-03-06 03:04:48 -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
Yoshax
45af122441 forcemove 2017-03-05 23:58:17 +00:00
JoanRisu
997623c2da Adds some 64x32 two-handed gun sprites to the code. 2017-03-05 15:43:41 -08: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
Arokha Sieyes
a6781237a7 Merge pull request #1104 from Poojawa/ds9-uniforms
DS9 Uniforms
2017-03-05 15:27:17 -05:00
Arokha Sieyes
bbd9317e17 Merge pull request #1100 from VOREStation/blueprints-2
Blueprints 2.0
2017-03-05 15:26:59 -05:00
Anewbe
b4ec8eb026 Oxyloss shows as cyan 2017-03-05 14:19:51 -06:00