560a24ee83
Merge pull request #6637 from Mechoid/AugmentsRespectBeds
...
Augments Respect Beds, Robotic
2020-01-25 22:14:02 -05:00
3b7a737c08
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
5e7735a807
Update brain.dm
2019-10-22 21:14:26 -04:00
6333e7ab72
Ports Polaris #6492
...
Fixes a divide by zero issue with brain damage and pulse.
2019-10-22 21:13:25 -04:00
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
50ff14f8f8
Merge pull request #6079 from Mechoid/AugmentPreWork
...
Augment Work
2019-06-16 20:58:32 -04:00
30726b47d6
Starts work on Organs affecting Reagent Processing
2019-04-18 13:09:48 -04:00
fd4dc97a8b
Merge pull request #6048 from Heroman3003/promcore-decay-fix
...
Fixes promethean cores decaying pointlessly
2019-04-08 12:02:19 -04:00
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
5644ee00fd
forgot to mark edit
2018-10-10 22:17:20 +01:00
b34714684a
gives prommie cores an icon
2018-10-10 13:48:22 +01: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
31761714b2
Adds a Neural implant for future implementation. Promethean brains have been updated to fit it.
2018-08-28 01:23:36 -07:00
eebb627f00
Partially ports the GLOB system
2018-08-14 18:14:09 -05:00
edf92c57f9
Language and Larynx Additions
2018-07-14 00:14:49 -04:00
8f9e817bf0
Language and Larynx Additions ( #5402 )
...
* Various Language Improvements
2018-07-13 21:13:47 -07:00
f7d77629af
Merge pull request #5339 from Anewbe/eye_color
...
Change-Eye-Color verb should work again
2018-06-10 15:39:37 -04:00
a8be0c1c82
Change-Eye-Color verb should work again
2018-06-08 18:54:49 -05:00
07e8ee1f50
Merge pull request #5289 from fludd12/splat
...
Prometheans can now be revived as originally intended.
2018-05-30 21:14:14 -04:00
8178c2bf1f
Merge pull request #5289 from fludd12/splat
...
Prometheans can now be revived as originally intended.
2018-05-30 18:13:26 -07:00
2d89d63c09
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/l3closet.dm
# code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/crates_lockers/closets/utility_closets.dm
# maps/southern_cross/structures/closets/misc.dm
# maps/submaps/surface_submaps/wilderness/DoomP.dmm
# vorestation.dme
2018-05-27 19:26:12 -04:00
917c7b71a5
Box of Things for Events and the Future MK1 ( #5281 )
...
* Lots of Stuff for Events
* Adds changelog.
* Review & QOL
2018-05-25 16:26:31 -07:00
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
30779d1204
Prometheans can now be revived as originally intended.
2018-05-24 10:03:13 -04:00
be73b8c36a
for(var/bad_code in world)
...
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
6756c5a483
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
...
# Conflicts:
# .travis.yml
# code/ATMOSPHERICS/components/unary/outlet_injector.dm
# code/__defines/_planes+layers.dm
# code/__defines/chemistry.dm
# code/__defines/mobs.dm
# code/_helpers/mobs.dm
# code/_onclick/hud/robot.dm
# code/game/area/areas.dm
# code/game/machinery/computer/supply.dm
# code/game/machinery/cryopod.dm
# code/game/machinery/doors/airlock.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/devices/communicator/messaging.dm
# code/game/sound.dm
# code/game/supplyshuttle.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/events/event_container.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/language/language.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_powers.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species_shapeshift.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_powers.dm
# code/modules/mob/living/say.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/logout.dm
# code/modules/mob/mob_helpers.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_icon.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_containers/syringes.dm
# code/modules/shuttles/shuttle.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/wildwest.dm
# maps/southern_cross/items/clothing/sc_head.dm
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-03-31 09:20:59 -04:00
3df290f46f
Ports antibiotics overhaul ( #5050 )
...
* Ports antibiotics overhaul
* Update the rest of the places "spaceacillin" is used where antibiotics is meant.
* Antibiotics port compiles
2018-03-22 09:55:49 -07:00
fa95ae3d42
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2018-03-04 13:32:53 -05:00
3c6e7a95b9
orgam
2018-03-03 11:43:50 -05: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
1c1e15a221
EMPs no longer make meat eyes fuzzy ( #4856 )
2018-02-18 01:09:04 -08:00
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
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
a93cb256ec
Ports Vorestation's emp effects and ion projectiles ( #4818 )
2018-02-15 12:29:33 -08:00
2cd47f9c80
squashed commits - ion pistol refactor and away mission emp nerf
2018-02-11 09:27:40 +00:00
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
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
1d9af61ff0
Adds a cap to losebreath
2017-11-26 21:55:55 -06:00
08bcfded73
Changes how organ infections work
2017-11-01 00:41:59 -05:00
a8513844ec
Adds a Trait system ( #4048 )
...
* Works on trait system, wip.
* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
dcd2580dc2
Merge pull request #3918 from Anewbe/liver_alcohol
...
Adjusts liver damage from alcohol
2017-09-26 07:01:15 -04:00
ee50dc7b01
Moves the Promethean core to the chest. They no longer need heads.
2017-09-24 21:38:30 -05:00
bc44ab42dc
Adjusts liver damage from alcohol
2017-09-23 12:15:36 -05:00
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
ebe5cc916d
Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
...
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
ea6128f986
Adds Modifier System, Changes Some Ling Stuff
...
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc. The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
980c982996
Fixes the conflicts in the original branch
2017-03-22 17:51:04 -05:00
9ef7496545
Infection code improvement WIP
2017-02-27 16:35:56 -05:00
d3607df788
Prosthetic organs have sprites and take emp damage properly
2017-01-21 16:04:43 -06:00
e93095bbda
Merge pull request #2722 from Anewbe/liver_damage
...
Makes tox damage more dangerous
2016-11-21 12:35:51 -06:00
Atermonera
