Commit Graph

353 Commits

Author SHA1 Message Date
Aronai Sieyes a849010ab1 Makes organ removal/attachment right again (#5192)
* Makes organ removal/attachment right again

* Limb reattach - Changeo Loggo
2018-04-25 12:03:10 -07:00
Arokha Sieyes 794185d3f2 Fixes infinite loop in FBP naming w/o client 2018-03-29 23:46:19 -04:00
Arokha Sieyes 657e98f11c POLARIS: Fixes #3264 (VS) - MMI insertion sanitizes w/o numbers allowed 2018-03-25 17:01:32 -04:00
Arokha Sieyes bf0babb9ec POLARIS: Fixes #3264 (VS) - MMI insertion sanitizes w/o numbers allowed 2018-03-20 14:58:00 -04:00
Arokha Sieyes 99032248ab Lifelike oversights 2018-03-17 12:14:13 -04:00
Arokha Sieyes 2107372404 Protean species 2018-03-17 12:14:13 -04:00
Leshana a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-03-15 22:41:14 -04:00
Mechoid 437aad2d77 Adds a Frankenstein Surgical Procedure (#4990)
* Makes a Surgery for Frankensteining

* Fix a thing.

* Tweak things!

* Sickness not permanent, Recovery is.
2018-03-05 19:46:05 -06:00
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
PrismaticGynoid 8712d7e902 Two organ bugfixes (#4877)
* Two organ bugfixes

First, allows FBPs with synthetic brains (posis and drones) to actually die from massive brain damage. Before, although the damage would still affect them, robotic vital organs taking 60+ damage would never actually kill the owner.

Second, stops the zombie organs bug from popping up in normal play. You were able to repair all the damage on an organ, but not the ORGAN_DEAD status, leading to "dead" organs that still functioned (and that you could never die from them taking damage). Now, repairing the damage surgically will remove that.

* Repair for dead undamaged organs too
2018-02-20 10:39:03 -06:00
Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
2018-02-07 19:30:50 -05:00
MarinaGryphon 72318d46b6 Replaces most of the gender macros. (#4681)
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06: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
Anewbe 056933a9e0 Merge pull request #4597 from VOREStation/pol-surgery
Fixes necrotic organ repair
2018-01-21 16:16:34 -06:00
Arokha Sieyes 378806471a Remove relative pathing from debridement surgery 2018-01-20 12:34:39 -05:00
Arokha Sieyes 1cc3e02dab Fixes necrotic organ repair 2018-01-20 12:30:18 -05:00
Cyantime a5cb20a820 Fixes multisurgery 2018-01-19 23:26:56 -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
Mechoid ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid 5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Arokha Sieyes fe2d09f17a Fix NIF surgery post-update
This line was put into the wrong block (a good example of why relative pathing is bad, since it made it unclear where it was before in normal code).
2017-12-26 01:50:04 -05:00
killer653 3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe b1c16837cb Redoes the whole surgery PR 2017-12-08 18:35:50 -06:00
Anewbe 1d9af61ff0 Adds a cap to losebreath 2017-11-26 21:55:55 -06:00
killer653 1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Mechoid e21b65ec85 Nails the Parentheses back on. 2017-10-15 11:13:46 -07:00
Mechoid ee4df4f862 Fixes roboheads being crammed onto flesh-bodies. 2017-10-15 11:01:20 -07:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe 1217c1d23c Merge pull request #3961 from MisterLayne/9/26/2017_CableSurgeryFix
Fixes cables on FBPs (and probably cyborgs)
2017-09-27 19:46:29 -05:00
MisterLayne c967d4cf6e Fixes cables on FBPs (and probably cyborgs) 2017-09-27 15:56:25 -04:00
Anewbe b47b1ce1f1 Adds the bone clamp, and some alien surgery tools 2017-09-22 20:45:00 -05:00
killer653 2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Anewbe 0b83e020af Better borg tools, improves Electric Welder 2017-09-20 21:48:15 -05:00
Anewbe c9f83a9d68 Merge pull request #3769 from PrismaticGynoid/forgottenlanguages
Brain transplants, synthetics, and languages
2017-09-16 15:35:29 -05:00
killer653 bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
PrismaticGynoid 9c1bb56522 Brain transplants, synthetics, and languages
Brains now retain languages from the mob they were removed from, rather than forgetting them. Languages are also retained when a brain is transplanted into a new body.

AIs, as well as cyborgs/robots/drones, will load languages from your currently-active preferences when they spawn (just like humanoid mobs do). Brains removed from cyborgs/robots/drones will retain their original languages regardless of the current module.

Brains in MMIs can now speak EAL if they know it, and additionally fixes #2832 - sign language will no longer be usable when lacking both hands. Also fixes silicons being told the wrong language prefix by the known languages window, as it was still showing ':', leading to much confusion among new borg players.

Known issues:
AIs who can use sign language can use it even without a holopad - I'm not sure how to have it check for that. This could be seen as a non-issue, as signs could conceivably be displayed on the AI's screen.

AIs signing over holopad will also have the language verbs overridden by the synth speech verbs (states/queries/declares). I'm pretty sure this has something to do with the already-existing bug that all languages can be understood by everyone when an AI speaks them over holopad.
2017-09-06 20:14:17 -07:00
Neerti 8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti 4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Mechoid 5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
killer653 468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Anewbe 6fda2e8c59 Prevents attachment of limbs over limb stumps while still allowing FBP construction 2017-07-27 17:40:32 -05:00
Anewbe 01e6161d87 New limbs can no longer be attached over limb stumps 2017-07-23 15:22:37 -05:00
Cameron653 e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Arokha Sieyes 6d58df9f60 Surgery and syringe fixes
Fixes a line printed about staying close to your patient printed in error, and makes syringes work on laying patients again.

The do_surgery overrides are from a bygone era.

Tested == yes
2017-06-09 02:11:23 -04:00
Arokha Sieyes a208283706 Surgery and syringe fixes
Fixes a line printed about staying close to your patient printed in error, and makes syringes work on laying patients again.

The do_surgery overrides are from a bygone era.

Tested == yes
2017-06-09 02:10:09 -04:00
Arokha Sieyes c829a195e1 Polaris-able surgery fix 2017-06-06 01:04:11 -04:00
Arokha Sieyes f7c24fb9d0 Polaris-able surgery fix 2017-06-06 01:00:45 -04:00
Arokha Sieyes 50accd426c Initial NIF Commit 2017-06-06 01:00:42 -04:00