8fe2ef9fde
Belt-Worn RIGs ( #6002 )
...
Belt-worn RIG framework
2019-03-30 03:20:41 -04:00
9dd973221d
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
b099ac6e4c
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
...
# Conflicts:
# code/__defines/holomap.dm
# code/__defines/mobs.dm
# code/_helpers/icons.dm
# code/_helpers/unsorted.dm
# code/_onclick/hud/hud.dm
# code/_onclick/item_attack.dm
# code/controllers/Processes/supply.dm
# code/controllers/subsystems/planets.dm
# code/datums/supplypacks/munitions.dm
# code/datums/supplypacks/science.dm
# code/datums/supplypacks/security.dm
# code/datums/supplypacks/supply.dm
# code/game/area/Space Station 13 areas.dm
# code/game/atoms_movable.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/door.dm
# code/game/machinery/jukebox.dm
# code/game/machinery/recharger.dm
# code/game/machinery/vending.dm
# code/game/mecha/equipment/tools/medical_tools.dm
# code/game/mecha/equipment/weapons/weapons.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/megaphone.dm
# code/game/objects/items/poi_items.dm
# code/game/objects/items/weapons/implants/implantlanguage.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/objects/structures/flora/trees.dm
# code/game/objects/structures/plasticflaps.dm
# code/game/supplyshuttle.dm
# code/game/turfs/simulated/wall_attacks.dm
# code/modules/admin/admin_verbs.dm
# code/modules/assembly/infrared.dm
# code/modules/client/client procs.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/client/preferences.dm
# code/modules/clothing/suits/miscellaneous.dm
# code/modules/holomap/holomap_datum.dm
# code/modules/holomap/station_holomap.dm
# code/modules/integrated_electronics/core/printer.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/death.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/robot.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob_movement.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/subtypes/standard.dm
# code/modules/planet/weather.dm
# code/modules/power/cable.dm
# code/modules/power/fusion/core/core_control.dm
# code/modules/power/fusion/fuel_assembly/fuel_control.dm
# code/modules/power/fusion/gyrotron/gyrotron_control.dm
# code/modules/projectiles/gun.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# config/names/first_name_skrell.txt
# config/names/last_name_skrell.txt
# icons/mob/head.dmi
# icons/mob/robots.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/obj/ammo.dmi
# icons/obj/gun.dmi
# icons/obj/mining.dmi
# icons/obj/projectiles.dmi
# icons/obj/rig_modules.dmi
# icons/obj/surgery.dmi
# icons/turf/walls.dmi
# 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-8.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
# maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
# maps/submaps/surface_submaps/mountains/deadspy.dmm
# maps/submaps/surface_submaps/mountains/mountains_areas.dm
# maps/submaps/surface_submaps/plains/Thiefc.dmm
# maps/~map_system/maps.dm
# vorestation.dme
2018-09-27 18:01:09 -04:00
5c35b9f284
Forces mech construction to work with the is_tool() procs
2018-08-04 20:42:53 -05:00
c2794c571d
Hopefully fixes some tool-conversion things
2018-08-03 15:13:29 -05:00
7f84aeab9f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool
2018-08-02 22:35:14 -05:00
729ce71aa0
Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format
2018-08-02 21:45:15 -05:00
e2da5d687b
Merge pull request #5386 from Mechoid/End_The_Tyranny_Of_Chemistry
...
Add a procedure for repairing limbs via surgery.
2018-07-14 15:57:52 -04:00
4b7896678a
Add a procedure for repairing limbs via surgery.
2018-07-10 23:48:14 -07:00
a751fbb3ee
Merge pull request #5314 from VOREStation/pol-encasedfracture
...
Fix surgery breaking bones when performed correctly
2018-05-31 22:06:59 -04:00
48bf825472
Fix surgery breaking bones when performed correctly
...
I have to believe this is somehow misplaced. "Whoops!"
2018-05-29 14:40:54 -04:00
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# 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/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
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
794185d3f2
Fixes infinite loop in FBP naming w/o client
2018-03-29 23:46:19 -04:00
657e98f11c
POLARIS: Fixes #3264 (VS) - MMI insertion sanitizes w/o numbers allowed
2018-03-25 17:01:32 -04:00
bf0babb9ec
POLARIS: Fixes #3264 (VS) - MMI insertion sanitizes w/o numbers allowed
2018-03-20 14:58:00 -04:00
99032248ab
Lifelike oversights
2018-03-17 12:14:13 -04:00
2107372404
Protean species
2018-03-17 12:14:13 -04:00
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
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
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
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
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
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
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
056933a9e0
Merge pull request #4597 from VOREStation/pol-surgery
...
Fixes necrotic organ repair
2018-01-21 16:16:34 -06:00
378806471a
Remove relative pathing from debridement surgery
2018-01-20 12:34:39 -05:00
1cc3e02dab
Fixes necrotic organ repair
2018-01-20 12:30:18 -05:00
a5cb20a820
Fixes multisurgery
2018-01-19 23:26:56 -05:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
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
10aabd98da
POLARIS: 3000% human/update_icons() improvement
...
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
ff02218ccb
Hatchets - > Machete subtype.
2018-01-12 21:21:18 -08:00
5efc484595
Makes knives all knives.
2018-01-12 18:02:07 -08:00
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
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
b1c16837cb
Redoes the whole surgery PR
2017-12-08 18:35:50 -06:00
1d9af61ff0
Adds a cap to losebreath
2017-11-26 21:55:55 -06:00
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
e21b65ec85
Nails the Parentheses back on.
2017-10-15 11:13:46 -07:00
ee4df4f862
Fixes roboheads being crammed onto flesh-bodies.
2017-10-15 11:01:20 -07:00
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
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
c967d4cf6e
Fixes cables on FBPs (and probably cyborgs)
2017-09-27 15:56:25 -04:00
b47b1ce1f1
Adds the bone clamp, and some alien surgery tools
2017-09-22 20:45:00 -05:00
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -04:00
0b83e020af
Better borg tools, improves Electric Welder
2017-09-20 21:48:15 -05:00
c9f83a9d68
Merge pull request #3769 from PrismaticGynoid/forgottenlanguages
...
Brain transplants, synthetics, and languages
2017-09-16 15:35:29 -05:00
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
mistyLuminescence