Commit Graph

836 Commits

Author SHA1 Message Date
Arokha Sieyes
c9595f5ba8 Adds 'Quit This Round' verb for ghosts
This verb frees your job slot, removes you from the manifest, and removes your mind/body records so you can't be resleeved (if you do this sooner than 15 minutes, medical will not be nodified of your demise). This prevents you from respawning as that character (you can play any other character if you want).

**People should start using this**, it's really helpful to people who want to play your job if you're not coming back. Just use it if you're done for the day, or want to switch characters, or whatever.
2017-06-09 23:05:48 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Anewbe
a412b5063b Merge pull request #3423 from Belsima/ftm
Lets biological females have facial hair.
2017-05-29 18:31:18 -05:00
Arokha Sieyes
4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
Leshana
1b0474d57a Fixes Runtime in preferences_setup.dm,230: Cannot read null.title
proc name: dress preview mob (/datum/preferences/proc/dress_preview_mob)
2017-05-25 15:37:43 -04:00
Leshana
4197a6e60d Fixes Runtime in preferences_setup.dm,230: Cannot read null.title
proc name: dress preview mob (/datum/preferences/proc/dress_preview_mob)
2017-05-23 01:14:55 -04:00
Arokha Sieyes
3a856f5bad Merge pull request #1493 from VOREStation/aro-tether-wip
Tether Map
2017-05-20 17:19:32 -04:00
Leshana
5ae26332fa Merge branch 'master' into aro-tether-wip
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Screemonster
691aa28eba Adds a whole bunch of markings 2017-05-14 05:31:10 +01:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Arokha Sieyes
c541122123 Convert to using Mediamanager lobby music
Update the JSON!
2017-05-08 02:33:46 -04:00
Yoshax
c808a6fb66 Removes Unathi from chin bob 2017-05-06 20:27:28 +01:00
Yoshax
6635857cf1 Ports a bunch of hair or something 2017-05-06 19:37:55 +01:00
sabiram
6cfc825f53 Adds and fixes some hairstyles 2017-05-06 19:30:59 +01:00
SiegDerMaus
e64f0bb97b Adds Chin Length Bob
A new haircut for those who like bobs, but always hated how short the
one already in game is.
2017-05-06 19:26:22 +01:00
Belsima
dd9c91cf5f Lets biological females have facial hair. 2017-05-06 09:27:38 -04:00
Layla Crosse/Occula Drenn
a77def9829 Add's LiquidFirefly's Gazer fluff item stuff
Add files via upload

Add files via upload

Add files via upload

Added Gazertail to repository, fixed error.

Reverting bad changes.

Apologies for not reading.

Adding Monoeye.

Fixing bad changes, Readding monoeye.
2017-04-29 02:50:26 +01:00
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