Commit Graph

819 Commits

Author SHA1 Message Date
Leshana
2e59e24dca Merge branch 'master' of ../Polaris into polaris-sync 2017-04-16 20:58:40 -04:00
Leshana
7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
Anewbe
29eb4f5425 Makes two more markings Taj only 2017-04-14 23:25:46 -05:00
Cerebulon
18de8caf6a Adds two side swept versions of the Undercut haircut
Also removes a couple of unnecessary comments from the file.
2017-04-12 21:13:59 +01:00
Arokha Sieyes
e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
Arokha Sieyes
6d74e20e2a Fix up a few more things with synth printing
Species now 'suggested' by robolimb manufacturer, helps with getting the correct hairstyle choices for each synth, so Taj have access to Taj hair styles and whatnot in mirrors if they are using a Taj-based synth. Also adds a DSI Akula variant that Zalvine should touch up later hopefully.
2017-04-09 23:56:13 -04:00
Anewbe
e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Leshana
47b41582c3 Merge branch 'master' into vplk-persist 2017-04-04 21:44:28 -04:00
Arokha Sieyes
85a489b9b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-04-04 20:25:00 -04:00
Leshana
f17ea64bbe Enables round-to-round persistence of a few aspects of characters.
* More accurately, it automates updating your character setup.  None of this code does anything you could not already do manually on the Character Setup screen, it simply does it automatically for you.
* Specifically a few things are saved either at round end or when you cryo:
  * Your late-join spawn location is determined by which cryo/elevator/etc you used to leave last time.  Departing thru the elevators will set your spawn location to elevators etc.
  * Your weight is saved (also any extra or deficient nutrition is resolved into weight gain/loss)
  * Your limbs settings are updated based on your status at end of round (whether limbs are normal, missing, robotic, etc)
  * Your markings are saved so they will be the same as when they were at end of round.
* ALL of these changes are optional, toggled on the VORE tab of character setup.
* Replaced hard coded numbers for weight gain with constant defines.
2017-04-04 07:33:09 -04:00
Yoshax
cd3c77c0b9 Fixes a small body marking thing issue 2017-04-03 18:41:42 +01:00
Poojawa
57aa3dfd14 Sergal Markings 2017-04-03 04:14:22 -05:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Anewbe
91be79fdb3 Tweaks a bunch of body markings 2017-03-31 15:17:02 -05:00
Anewbe
cc3e91de21 Merge pull request #3188 from VOREStation/aro-pol-bodymarks
Symbols make sprite accessories freak out
2017-03-31 00:58:15 -05:00
Arokha Sieyes
7f99b3b45d Symbols make sprite accessories freak out
Like plus or ampersand or single or escaped quotes in the name, it goes crazy. You can't remove Socks+Belly because it has a plus, once you've added it. I have no idea why. But here's a quick fix.
2017-03-31 01:48:00 -04:00
Arokha Sieyes
44293624ff Symbols make sprite accessories freak out
Like plus or ampersand or single or escaped quotes in the name, it goes crazy. You can't remove Socks+Belly because it has a plus, once you've added it. I have no idea why. But here's a quick fix.
2017-03-31 01:33:45 -04:00
Anewbe
d59f0f1dc4 Merge pull request #3152 from VOREStation/aro-pol-bodymarks
Adds Body Markings
2017-03-30 20:13:15 -05:00
Arokha Sieyes
c828a85f06 Adds Body Markings - VOREStation Species
Vulps! And removes whitelist for parts.
2017-03-30 18:57:48 -04:00
Arokha Sieyes
e116f08d24 Adds Body Markings
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.

The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.

They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
2017-03-30 18:05:20 -04:00
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Arokha Sieyes
52130160db Adds Body Markings
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.

The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.

They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
2017-03-26 19:36:34 -04:00
nachomeep
fda29e2bc0 big sprite update for skrell 2017-03-25 10:08:03 -04:00
MagmaRam
e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas
Adds rugged style PDAs
2017-03-22 19:42:19 -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
81549fc965 Revert "BlockHeadHair doesn't make players bald." 2017-03-03 17:19:07 -06: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
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
Neerti
12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
nachomeep
2d4cf21dc3 fixes minor screwup 2017-02-26 16:53:07 -05:00
nachomeep
69195b2ae4 Returns gender flags 2017-02-26 16:51:43 -05:00
nachomeep
5828504f2f No bearded women. 2017-02-26 12:13:09 -05:00
nachomeep
cdb6c32c91 Fixes a few things, adds changelog. 2017-02-25 10:18:10 -05:00
nachomeep
9d3aba5832 Fixes blockheadhair tag. 2017-02-25 09:49:24 -05:00
Anewbe
2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Anewbe
79390b6177 Adds rugged style PDAs 2017-02-04 22:42:06 -06:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
killer653
e090d45e35 Github client didn't save this. 2017-01-22 10:47:53 -05:00
Anewbe
d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Neerti
14c67e0893 Two bugfixes
Ghosts should be able to hear things once more.
The big bold NEW NEWS notice should remember if one has already seen the news, as the hash was not actually being saved.  It's being saved now.
2017-01-17 04:11:57 -05:00
Cameron653
300dd33e51 Fixes the floorlength braid... again 2017-01-16 15:07:27 -05:00
killer653
832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
MagmaRam
39f5c4705c Merge pull request #2912 from Anewbe/baystation_cosmetic_things
Ports a bunch of Baystation's underclothes and hair
2017-01-12 18:08:37 -06:00
Anewbe
a4471556b1 Ports a bunch of Baystation's underclothes and hair 2017-01-11 19:12:49 -06:00
Neerti
fdc2fe1fbc Adds new Server News
Adds ability for admins with R_SERVER perms to be able to set a persistant 'news' announcement that works similarly to admin memos, but for the public.  This is ideal for telling the public things such as when an event is scheduled, directing people to a forum thread, new lore changes, new policies, etc.
The news window allows to define a title, and the body of the text, using an admin verb.  The author and date are added automatically.
Any players can read the news window in the lobby.  The button will bold itself, and display (NEW!), if the player has not seen the news before.  This is done by comparing a hash of the body that the client remembers verses a hash the current news body.
2017-01-10 04:36:38 -05:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Anewbe
572c17c440 Fixes some incorrect times for respawn things. 2016-11-25 21:59:30 -06:00