Commit Graph

1259 Commits

Author SHA1 Message Date
Belsima 3c6e7a95b9 orgam 2018-03-03 11:43:50 -05:00
Arokha Sieyes 3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
Belsima a578eeeb85 plushie love (#4964)
* plushie love

* Kiss2

* good god why

* you can make severed heads kiss now :)

* [I] first

* [I] first2

* comma

* comma
2018-02-27 14:49:06 -06:00
Atermonera 61ca538e06 Merge pull request #4929 from Anewbe/splints
Splints no longer perfectly prevent negative effects from broken bones
2018-02-24 22:52:25 -08:00
Anewbe 8eb72ead35 Robolimbs require repair at 30 composite damage 2018-02-24 02:37:09 -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
Atermonera 9993031500 Merge pull request #4917 from Anewbe/surgery_oversight
Corrects an oversight with surgery and defibs
2018-02-22 18:25:04 -08:00
Anewbe af62498e28 Progress 2018-02-22 19:49:30 -06:00
Anewbe 14336e7985 Corrects an oversight with surgery and defibs 2018-02-21 18:57:51 -06:00
Anewbe 76fab07f52 Zheng Hu Improvements 2018-02-20 20:58:36 -06: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
Belsima 3f4576dc58 rainbow 2018-02-19 14:52:50 -05:00
Anewbe 1c1e15a221 EMPs no longer make meat eyes fuzzy (#4856) 2018-02-18 01:09:04 -08:00
Leshana ef3df27528 VOREStation Specific Merge Changes
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
2018-02-17 16:56:31 -05:00
Leshana 7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
2018-02-17 00:35:29 -05:00
Anewbe a93cb256ec Ports Vorestation's emp effects and ion projectiles (#4818) 2018-02-15 12:29:33 -08:00
Screemonster 2cd47f9c80 squashed commits - ion pistol refactor and away mission emp nerf 2018-02-11 09:27:40 +00: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
Anewbe 3e31b6678f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ghettoChutes 2018-02-05 00:53:33 -06:00
Anewbe 67e22cf0a6 Closets and Mechs no longer prevent death by freefall 2018-02-05 00:53:12 -06:00
Cameron653 1999fc2a2a Changes 'undislocate' to 'relocate' (#4650)
* Chaning undislocate to relocate.

Have to use web browser for this one at the moment.

* Changes undislocate -> relocate

* Last file to change to relocate

* Changes it to the best medical term for the action.

* Reduce -> Relocate
2018-02-03 22:45:50 -06: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
Leshana 27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
Mechoid 6df90c09e3 Allows Prometheans to be cloned from their Core. (#4602)
* Allows Prometheans to be cloned from their Core.

* Swap brain cloning dependency from the cloner to the brain itself.

* Fffffff Changelog. And to_chat.
2018-01-24 18:19:32 -06:00
Leshana 805897eafb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20 2018-01-21 00:23:00 -05:00
Atermonera 17accf2e28 Band-aids three runtimes (#4591)
* Runtime in dna_modifier.dm,330: Cannot read null.occupant

* Runtime in Chemistry-Reagents.dm,47: Cannot execute null.remove reagent().

* Runtime in blood.dm,182: Division by zero

* Compiled with the right map this time
2018-01-20 13:28:51 -06: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 0a037f0fe0 Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10
Polaris Sync 2018 01 10
2018-01-16 02:46:25 -05: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
Leshana 5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
2018-01-15 13:27:39 -05:00
Mechoid 91be171f62 Adds a species flag for preventing infections, akin to IS_PLANT, without its other traits. 2018-01-09 12:42:20 -08:00
Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
Verkister 2c02938b1b Update organ_external.dm 2018-01-01 18:49:22 +02:00
Verkister a6d45cf39a Eliminates one possible culprit behind dismemberment crashes.
-Okay so. The dismemberment related crashing has decreased in the mob icon cache related cases, but another circumstance has been revealed pointing towards the severed limbs themselves.
-(Someone got splattered yesterday downstream and nuked half server into chain crashing)
-Anyhow. I personally had completely forgotten to update my client last year from an awfully outdated pre-PIXEL_SCALING version, but I happened to do it way after people began crashing and cannot remember encountering a single crash from the before time.
-Which led to a theory that our poor little Byond simply has trouble adjusting to fresh features and occasionally gets overwhelmed by the task of tossing around a bunch of severed limbs inheriting their owner's visual properties while also having to randomly rotate each one.
-This thing just disables pixel scaling from severed limbs upon dismemberment.
-Because of the evil nature of the bug unpredictably manifesting in action and often leaves some witnesses un-crashed, I have no proof if this helps anything but I'll just toss it up and see if it sticks.
2018-01-01 18:40:48 +02:00
Arokha Sieyes d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.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/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2017-12-26 23:07:58 -05:00
BothNevarBackwards 4540f770d4 Lots of species stuff ported from Baystation (#4442)
* Ports species based footprints from bay
- https://github.com/Baystation12/Baystation12/pull/17935
- https://i.imgur.com/ojAU373.png
- Unathi use claw on right
- Taj and tesh use paw in center

* Flash stuff glasses protection things

* Flash stuff actual thing

* Organ mult thingy

* Floaty eyes and cloak setup

* Species falling
2017-12-26 14:28:21 -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
Cameron653 b7d0c61cee Merge branch 'master' into CHIRRET_SPECIES 2017-12-18 19:48:38 -05:00
Arokha Sieyes 7c26e03d52 Reenable organ rejection but make it work correctly
Based on the name of the species, rather than datum, so printed/former bodies of the same species used as donors (or anyone with the same species name, really, if you want to do certain things, like "Chakat" organs would be compatible with each other).
2017-12-16 11:23:37 -05:00
killer653 55230a5b1f More edits! 2017-12-15 22:12:28 -05:00
killer653 7f70702f58 WIP. 2017-12-14 22:54:01 -05:00
SubberTheFabulous 9dbb99b515 Adds yet another FBP, also fixes a little sprite error (#4419)
* Adds new set of cyberlimbs, fixes annoying sprite

* Adds a new set of robolimbs

FOR SOME REASON

* Fixes stuff

i miss things ok

* Update robolimbs.dm

* Update robolimbs.dm
2017-12-11 00:46:51 -06:00
Anewbe c95206c9f3 Makes species bleed out faster or slower 2017-12-02 18:14:35 -06:00
Cameron Lennox 755f8828a6 Allows xenochimeras to choose icon base 2017-12-02 16:04:20 -05:00
Neerti 2f7db506eb Adds Variable Click Delay
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
2017-11-28 16:11:56 -05:00
Anewbe 1d9af61ff0 Adds a cap to losebreath 2017-11-26 21:55:55 -06:00
Neerti 595f874f9b Merge pull request #4264 from Anewbe/decap_defib
Decapitation now stops defibrillation
2017-11-19 17:50:03 -05:00
killer653 463b9c4dfb Edited files 2017-11-17 19:28:26 -05:00
killer653 da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00