Commit Graph

929 Commits

Author SHA1 Message Date
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-02-23 21:55:42 -05:00
Arokha Sieyes
1720cd54f3 Create humans ON their spawn points
Instead of moving them there later.
2018-02-22 20:14:39 -05:00
Aronai Sieyes
4917222a6b Merge pull request #3086 from Verkister/backgrounds
Preview background fixes and additions.
2018-02-21 17:17:50 -05:00
Cyantime
c1cdbacfe4 Corrects inkling color blend mode 2018-02-20 18:23:12 -05:00
Verkister
1bcbcc926d Preview background fixes and additions.
-Fixes flat white background capitalization error.
-Re-enables tunnel plating and reinforced floor.
-Adds darker plating, ribbed techmaint tiles, and flat middle grey.
-Tweaks their cycle order to cycle flats by shade, and then tiles by shade.
-Moves our update preview code underneath the polaris original.
-Polaris bg list update waiting for merge out there as well, but let me know anyway if I should do a temporary vorestation edit comment until next sync tho.
2018-02-20 09:52:56 +02:00
Arokha Sieyes
55ba550409 More optimizations for character joins 2018-02-17 23:24:11 -06:00
Arokha Sieyes
0dd7a2e2e3 Initial cleanup/changes 2018-02-17 19:47:39 -06:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
Leshana
cef001bf2a Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
Arokha Sieyes
17723b7df6 Cleans up references to assistant
Defines the USELESS_JOB value as "Visitor"
2018-01-31 00:55:13 -05:00
Arokha Sieyes
201ef9523c Removes obsolete assistant ratio code, fixes nonconstant declaration 2018-01-29 01:22:41 -05:00
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
Verkister
f94a1f5d69 Disables our outdated hair file override.
-No longer needed after Polaris had theirs updated.
2018-01-27 22:57:29 +02:00
shazbot194
151e2b2b5b Adds in twin drills
As the title says.
2018-01-22 12:09:01 -09:00
Arokha Sieyes
5d6d0bae15 Adds an admin verb to toggle it easier 2018-01-21 21:45:36 -05:00
Arokha Sieyes
4792ea713a Allows setting/enforcing an assistant ratio 2018-01-21 21:03:11 -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
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Spades
54b5d74ada Revert "Chirret species" 2017-12-19 19:47:50 -05:00
killer653
55c8c8a6fb Merge remote-tracking branch 'refs/remotes/VOREStation/master'
# Conflicts:
#	icons/mob/human_races/markings_vr.dmi
2017-12-17 04:06:35 -05:00
Spades
82a351efc7 Merge pull request #2556 from Verkister/markenings
Some markings tweaks and such.
2017-12-16 08:29:49 -05:00
killer653
b91a3c0ea7 Chirret Edits 2017-12-15 19:31:42 -05:00
killer653
7f70702f58 WIP. 2017-12-14 22:54:01 -05:00
Verkister
1b165c36a3 Some markings tweaks and such.
-Fixes the side view arms on cow body markings.
-Adds the wider sorta sergal base eyes as markings (for custom species etc)
-Adds vulp snout stripe marking (like the vulpine facial without the rest of snout)
-Adjusts teshari hair highlights to better match our multiply body hair stuff.
2017-12-09 11:15:12 +02:00
Cameron Lennox
755f8828a6 Allows xenochimeras to choose icon base 2017-12-02 16:04:20 -05:00
Kholdstare34
411a1b5002 Adds the "Short Hair 3" hairstyle. 2017-11-28 00:55:32 -06:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
mistyLuminescence
396b2c78e7 Removes bad meme from hairstyle code 2017-11-06 14:38:37 +00:00
killer653
7a3bf3cd89 More edits 2017-11-04 13:45:26 -04:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Neerti
318ccff1c9 Merge pull request #4177 from Anewbe/background
Ports the background icons for char setup
2017-10-30 20:35:55 -04:00
Spades
fa38bec798 Merge pull request #2382 from Verkister/hairrevolution
It's time for hair color revolution!
2017-10-30 13:56:11 -04:00
Verkister
404ac0f42c It's time for hair color revolution here too!
-Aye greetings from downstream hell where I managed to solve the locally intense ADD vs MULTIPLY blend mode discource once and for all with a fresh as hell new option that combines the best of both worlds without the downsides.
-You can now have hairstyles that retain both, shading and highlights in every color how cool is that?
-Got told to port this stuff up here too so you're welcome. Spread the word if ya want. Planning to hit up the other blend stuffs as well some time, but here's a little something for now.
2017-10-28 17:00:21 +03:00
Anewbe
c68fb0861f Ports the background icons for char setup 2017-10-27 23:00:34 -05:00
Verkister
d879d481d7 It's time for hair color revolution!
-I SOMEHOW FIGURED OUT A COMBO BLEND THAT COMBINES THE BEST OF BOTH, ADD AND MULTIPLY AND LOOKING GOOD AT ALL COLORS IN LESS THAN AN HOUR AAAAAAAA!
-IMPOSSIBILITIES MY ARSE I AM GOD HSGHFJSD
-May need some adjustments in case some bases don't behave as well as they should but that's a task for future me after people have found and pointed out the hypothetical fucky hairstyles I'm too stoked to not rush this through right now lmao.
2017-10-28 00:58:13 +03:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Xsdew
4b6ff72f6d Catwoman Markings
This adds four new markings, all inspired from Felicia from Darkstalkers. The Catwoman chest,groin,left leg, and right left markings.
2017-10-24 20:12:22 -04:00
Yumi (AKA Gowst)
110f23bbbe adds panda ears and eye markings to character customization 2017-10-19 16:06:53 -05:00
Anewbe
04c393a953 Adds the Vatborn lore blurb, fixes some things. 2017-10-19 10:28:34 -05:00
Verkister
a5146769e0 Fixes a game breaking conflict related to disabled polaris trait system 2017-10-17 13:27:20 +03:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Anewbe
f42457b997 Starts work on the Vatborn Human species 2017-10-15 23:26:22 -05:00
Neerti
a8513844ec Adds a Trait system (#4048)
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
Natje0
872bef5b45 ...Fixes a smol mistake so the hair sprite shows.
OK, NOW EVERYTHING IS TESTED AND WORKS.
2017-10-12 16:51:26 +02:00
Natje0
55747968f5 Accomodates Gazers Lilianfluff fix 2017-10-12 04:42:10 +02:00
Natje0
3ec3a0de7c Code for Hair and EyeMarking 2017-10-12 03:30:22 +02:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Cameron653
02682ede9a This shouldn't be capitalized 2017-10-04 13:54:07 -04:00
Spades
176a425188 Merge pull request #2256 from Verkister/spriteshitonceagain
More hyuuge icon blending overhauls! (ADDrocities begone!)
2017-10-03 22:31:43 -04:00