Commit Graph

1083 Commits

Author SHA1 Message Date
Leshana 9ca5337c98 PTO Implementation
* Adds SSpersist which updates people's PTO balance every 15 minutes
* Adds "Off-duty" jobs which can only be taken if you have enough PTO.
2018-01-28 23:27:21 -05:00
Leshana 27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
Aronai Sieyes 88cab44124 Merge pull request #2848 from VOREStation/aro-exploration
Exploration Update
2018-01-27 15:32:42 -05:00
Arokha Sieyes b8d2766ee3 POLARIS: Sort jobs into correct departments
Also give cargo some color
2018-01-27 14:10:54 -05:00
elgeonmb 3d5740c909 adds an e-reader full of news to the loadout (#4619)
* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster
2018-01-25 18:18:35 -06:00
Arokha Sieyes 3140bcf8a2 Fix commlink being in loadout 2018-01-25 16:42:56 -05:00
Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
2018-01-22 12:10:19 -05:00
BillyBangles bfeda4c28b properly names the communicator watch selector (#4601) 2018-01-20 21:32:44 -08:00
Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-01-19 17:52:25 -05:00
BillyBangles c44af58716 Adds communicator watch (take 2) (#4406)
* adds communicator watch

* adds commwatch to a loadout selection list

* adds changelog

just in case
2018-01-17 19:33:32 -06:00
Arokha Sieyes 30790f2bd5 Merge pull request #2776 from VOREStation/vplk-cspbabcd
Fixes character setup preview backround changing.
2018-01-17 18:36:45 -05:00
Leshana a25f531e70 Fixes character setup preview backround changing. 2018-01-17 18:15:24 -05:00
Arokha Sieyes ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Arokha Sieyes f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Arokha Sieyes 10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
PrismaticGynoid 10b2cc7eef Multiple loadout slots (#4530)
* Multiple loadout slots

Ported from Bay. Each character can have 3 (number can be overridden by config) loadout slots. This way, you can have different outfits for different situations without needing to have a separate character slot or edit your loadout every time.

Tested here, works as intended. The current loadout is set as slot 1, so you don't need to worry about remaking it. This also ports the to_file and from_file macros to make it work, I'm assuming they could later be used elsewhere as well.

* Log of Changing
2018-01-14 14:47:47 -06:00
Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
PrismaticGynoid 5ffb0ee7e7 Replaces NT Relation with Economic Status
Because starting money is pretty much all it affects, anyway. Instead of just being used to measure NT's opinion of you, you now choose income categories to fall under. This still affects how much money you start with, with the highest category giving a 1.3x modifier, but the lowest has been lowered to 0.5 times. Now you can start with even less money than before.

Currently doesn't change the "this person might be willing to help you" message for traitors, but it would be easy to do something different with that if requested.
2018-01-07 14:12:10 -08:00
Leshana 65724afe58 Merge pull request #2687 from VOREStation/aro-sani
Fixes a couple of charsetup sanitizes
2018-01-05 14:22:07 -05:00
Arokha Sieyes 13b28ede55 Fixes a couple of charsetup sanitizes
No more "YOU DIDN'T SET A SCALEEEEE" on new characters. Defaults to 100%.
2018-01-05 12:28:15 -05:00
Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
Leshana 4906d5ca83 Fix exploit allowing choosing unlimited languages on character setup.
* Checks list length after input() returns so you can't cheese it.
* Sanitizes list to proper length so existing characters over the limit will be fixed.
2018-01-04 20:52:35 -05:00
Atermonera c9941e2450 S&R loadout spacing (#4486)
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Adds the disabled mech tools.

* indentation

* S&R is inline w/ explorer roles in char setup
2018-01-02 20:04:32 -05:00
Mechoid 3eb479b85f Merge pull request #4468 from Neerti/12/29/2017_the_resource_war
Might Fix Resource Lag
2017-12-29 18:05:42 -08:00
Neerti 68a4ea95ba Might Fix Resource Lag
Removes the dynamic setting of preload_rsc, because BYOND does not appear to respect it if it's not compiled in, and the dynamic nature of it is unused to my knowledge. If you need to change it, you can change a define in _compile_options.dm
This should now properly set it to '1', which should load all the resources at once, which might make some significant slowdown when first connecting, but should be preferable to constantly getting mini-lags when moving to new areas or hearing new sounds (like when getting shot at!).
2017-12-29 03:58:25 -05:00
Leshana a435d73450 Ports /tg controller optimizations
https://github.com/tgstation/tgstation/pull/31092 - Fixes subsystems not returning a qdel hint
https://github.com/tgstation/tgstation/pull/31494 - In which the stoner one gets stoned and tries to address tick contention... again
https://github.com/tgstation/tgstation/pull/31950 - Removes an empty New()
https://github.com/tgstation/tgstation/pull/31951 - Logs subsystem shutdowns
2017-12-27 21:19:55 -05:00
Arokha Sieyes e4d590f4e2 Add legwraps to loadout shoes list
They're for digitigrade people who wanna look stylish!
2017-12-27 14:49:32 -05:00
Cyantime 9e573e69fb Updates paths due to Polaris change 2017-12-25 22:31:01 -05:00
killer653 3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe 3b89c5e320 Merge pull request #4384 from Belsima/maid
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
2017-12-12 19:51:35 -06:00
Anewbe 393144068e Merge pull request #4427 from MisterLayne/fear_of_needles
Trypanohpobia
2017-12-12 19:30:01 -06:00
MisterLayne ccc88ed9d1 Fear the needle (in that person's hand, too). 2017-12-12 16:18:33 -05:00
Anewbe ff1103c7d9 Removes the military clothing from the loadout, repaths things 2017-12-07 21:21:05 -06:00
Belsima bb6d52d13d Adds blennophobia. (#4397)
* Adds blennophobia.

* Adds blennophobia to character setup.

* fear updates
2017-12-05 23:51:36 -06:00
mistyLuminescence 532cc711fa PsychHUD! 2017-12-04 00:05:10 +00:00
Cameron Lennox 4856786ceb Makes xenochimera able to select "Xenochimera" 2017-12-02 19:08:12 -05:00
Cameron Lennox 755f8828a6 Allows xenochimeras to choose icon base 2017-12-02 16:04:20 -05:00
Belsima 0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Belsima 2d3a306dea Loadout additions + fixes. (#4339)
* Loadout additions + fixes.

* Selection fix.
2017-11-27 19:21:49 -06:00
Verkister dcdeba60ae adds gn set 2017-11-22 23:53:59 +02:00
Verkister d699b23e9f Adds yet another new loadout accessory.
-Drop straps. Basically dropped suspenders or drop pouches without the pouches.
-Basically I've been really digging the aesthetic thiccness of the drop pouches and just wanted the look available without the access walls and color restrictions.
-Yeah it's colorable too.
2017-11-22 22:56:38 +02:00
mistyLuminescence b1bfea36dc Friendships are no longer priceless 2017-11-18 17:55:35 +00:00
Verkister bb2deea01d Fixes my lossed updoots. 2017-11-18 17:39:00 +02:00
killer653 da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
mistyLuminescence 0d9a175aac Adds bracelets! 2017-11-17 18:27:35 +00:00
Verkister 7c7794f74f Unrestricts my fluff goggles for general loadout use.
-Opie's orange goggles and Cameron's aesthetic science goggles.
-The orange goggles can also be worn on ear slot in order to have their up state above the hair layer.
2017-11-16 09:31:27 +02:00
Neerti 0315b18185 Makes Icon Scaling Great
Scaling wasn't great before so no Again.
Makes most icons not get blurry when scaled.
Makes all /atom/movable s able to be scaled with the adjust_scale() proc.
Adds ability for species to get scaled automatically.  Currently no species does this, but it is an option in the future.
Adds four traits to adjust your mob scale.  It is purely cosmetic at this time.
2017-11-14 19:32:49 -05:00
Verkister 8c1fb156be Adds a cosmetic "armor vest" taur saddlebag subtype.
-Works with 4-legged taurs as the other taurbags.
-Has normal backpack stats whereas the other saddlebags have duffle stats.
2017-11-14 16:18:47 +02:00
Spades c37c291c10 Merge pull request #2455 from VOREStation/Cameron653-patch-1
Loadout edits
2017-11-12 11:55:17 -05:00
Spades 4de5f0b989 Merge pull request #2450 from Verkister/fuzzytoggle
Adds toggleable character pref for sharp/fuzzy scaling. (Tested.)
2017-11-12 11:49:29 -05:00