Commit Graph

2664 Commits

Author SHA1 Message Date
Leshana 5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Leshana 497f2cc2d3 Fixes Runtime in 04_resleeving.dm,32: Cannot read null.ckey
proc name: copy to mob (/datum/category_item/player_setup_item/vore/resleeve/copy_to_mob)
And fixes Runtime in infocore.dm,175: code/modules/resleeving/infocore.dm:175:Assertion Failed: !deleted(M)
   proc name: init from mob (/datum/transhuman/body_record/proc/init_from_mob)
2017-05-23 01:14:56 -04:00
Schnayy b1cb74b318 Adds 4 new clothing sprites & puts them in the loadout.
Peacoats: Requested.

Black corset/skirt combo: Requested.

Flower dress: First ss13 sprite I made, threw it in.

Red swept dress: A new, nicer red dress.
2017-05-22 18:08:01 -05:00
Arokha Sieyes 5f91134f6a Remove elevator spawn point 2017-05-20 22:26:08 -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
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
Cerebulon 0ce6ca7290 Cleans up uniform loadout menu.
Suits are now mostly under one-piece (subtypes of 'lawyer') and modular (subtypes of 'suit_jacket') selection menus. Croptops also under selection menu.
2017-05-08 00:31:31 +01:00
Anewbe 3b82b75f83 Merge pull request #3396 from Cerebulon/skirtsuits
Adds 24 new skirt versions of suit sprites.
2017-05-05 21:55:14 -05:00
Cerebulon 36decd20b7 Adds icons. Adds skirts to loadout options and closets. 2017-04-30 02:39:27 +01:00
Cerebulon 339b269393 Adds 23 new skirt versions of existing suit sprites.
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
2017-04-29 12:01:40 +01:00
Yoshax 7662693036 Fixes an issue with tails 2017-04-27 22:35:41 +01:00
Arokha Sieyes 7519133444 Merge pull request #1417 from Yoshax/qollife
Fixes some character setup issues
2017-04-23 23:53:15 -04:00
Yoshax ec5cb4d950 Does Aronai things 2017-04-22 00:57:14 +01:00
Yoshax 9d33b7662e Fixes some character setup issues 2017-04-20 16:23:21 +01:00
Leshana f8e34eabbb Un-scale HUDs for micros and macros.
* Set appearance_flags on HUD images to prevent them from being scaled up/down when the owning mob is macro/micro.
* Optimized the resize() proc and made it adjust the vertical position of the unscaled hud to stay even with the top of the mob's head.
* Also fix the resize proc to be consistent with update_icons().   Now micros wont be in the middle of a turf temporarily after resizing.
2017-04-19 23:59:16 -04:00
Anewbe b7751bab10 Changelog, adds the dicecup to the loadout 2017-04-17 12:44:34 -05:00
Arokha Sieyes 42998da918 Fix 'if' statement on Panic Bunker
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
2017-04-11 00:13:54 -04:00
Arokha Sieyes 66327aecc7 Quick & Dirty Panic Bunker Port
Tested on our server, works. Doesn't work if you don't have a DB (how would it?).
2017-04-11 00:13:43 -04:00
Arokha Sieyes ba1221889c Fix 'if' statement on Panic Bunker
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
2017-04-11 00:12:32 -04:00
Arokha Sieyes b3d652fa50 Quick & Dirty Panic Bunker Port
Should work! Should.
2017-04-10 22:38:58 -04:00
Arokha Sieyes dc22050140 Loadout path fix 2017-04-10 20:55:24 -04: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 5cb6d250d0 Adds 'Subsleeving' into prey
Allows the resleever to sleeve minds into people inside the resleeving pod's occupant, aka if you want you can print a new body for the person (or if you're wiping some existing person, take a living person), have someone eat them, then get in resleeving pod and revive them in a gut. That'll keep them from walking around and tripping too much, yuh.

I'm sure there's a million crazy things you could do with this (eat person you want to impersonate, resleeve yourself into them while they're in your guts, then escape your own guts?) so have fun with that.

For technical reasons, for now, you cannot sleeve the PRED if they have prey in them in the resleeving pod. It has to do with wiping out their bellies and forgetting where their prey are. This would happen to prey if the prey has their own prey, as well, but... don't? Also you can always just OOC escape if you get trapped like that.
2017-04-10 01:33:40 -04:00
Leshana eef8480444 Adds the Body Designer for resleeving
* Adds Body Designer computer, which allows you to customize body designs similarly to character setup, but in game.
* Designs are savable to disks which can be loaded into the the resleeving controller console to print and resleeve into.
* Fixes line breaks on OOC notes in the resleeving computer.
* Added circuits so the body designer is constructable, and designs so the circuit is researchable.
* Added a proc for reverse lookup of size_multiplier -> scale name (0.25 -> Micro etc)
2017-04-09 16:23:35 -04:00
Anewbe 4a33a8df82 Merge pull request #3216 from Neerti/3/22/2017_the_empress_protects
Implements the new Codex.
2017-04-08 13:02:43 -05:00
Neerti a4a05ae4ec Implements the new Codex. 2017-04-08 12:08:08 -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
Leshana 39cf9a9a9b Use species for determining which organs to persist.
Also added some safety checks, and better handled digitized brains.
2017-04-04 20:52:26 -04:00
Arokha Sieyes 909b02444d Merge pull request #1343 from VOREStation/aro-sync
Polaris Sync
2017-04-04 20:52:03 -04:00
Arokha Sieyes 0d76e76671 Merge pull request #1330 from VOREStation/aro-vantag
"Event Character" HUD
2017-04-04 20:40:23 -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
Arokha Sieyes df84a2329a Renames V-ANTAG to Event 2017-04-04 20:22:09 -04:00
Anewbe 6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05: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
Poojawa b52857e175 Update loadout_uniform_vr.dm
misplaced comma
2017-04-03 23:04:31 -05:00
Poojawa e44e1c6c44 sergal hardsuits 2017-04-03 22:59:40 -05:00
Arokha Sieyes 9e90a293ec VANTAG Hud stuff 2017-04-03 19:35:09 -04:00
Anewbe b38986b4b7 Merge pull request #3209 from Atermonera/master
FBPs can have numbers in their names.
2017-04-03 13:56:06 -05:00
Atermonera 67d9f03e4d FBPs can have numbers in their names. 2017-04-02 13:53:49 -07:00
Anewbe 8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -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 29a25cc9b0 Merge pull request #3164 from Cerebulon/synth_brain_rename
Changes character setup to use correct in-lore names for brain types.
2017-04-01 16:00:19 -05: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
Cerebulon 98d3ebf6dd Fixed full options not showing up for non-FBPs. Repeated more thorough testing with newest changes. 2017-04-01 03:09:55 +01:00
Anewbe ca47d37d2f Adds a few more cosmetic flashlights 2017-03-31 18:50:00 -05:00
Anewbe d59f0f1dc4 Merge pull request #3152 from VOREStation/aro-pol-bodymarks
Adds Body Markings
2017-03-30 20:13:15 -05:00
Anewbe 2867f17b51 Merge pull request #3162 from Schnayy/department_jackets
Adds Department Color Jackets
2017-03-30 20:11:39 -05:00
Arokha Sieyes c828a85f06 Adds Body Markings - VOREStation Species
Vulps! And removes whitelist for parts.
2017-03-30 18:57:48 -04:00