Commit Graph

879 Commits

Author SHA1 Message Date
Neerti f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat 1415c6cd0a Merge pull request #4843 from VOREStation/upstream-merge-5993
[MIRROR] Fixes the greatest bug to affect our time.
2019-03-28 22:00:55 -04:00
Novacat 785a36d4e0 Merge pull request #4783 from VOREStation/upstream-merge-5942
[MIRROR] Headgibbing is a config thing
2019-03-28 21:27:19 -04:00
Novacat e5fdafd56e Merge pull request #4781 from VOREStation/upstream-merge-5969
[MIRROR] Fixes Diona and Promethean prosthetics.
2019-03-28 20:46:05 -04:00
Neerti 256fb03dcc Merge pull request #5942 from Anewbe/headgibs
Headgibbing is a config thing
2019-03-28 20:38:34 -04:00
Novacat 92a9d81599 Update robolimbs.dm 2019-03-28 20:33:14 -04:00
Novacat 25c9780722 Merge branch 'master' into upstream-merge-5965 2019-03-28 20:31:48 -04:00
Mechoid c604e38036 Adds Alien Reality pods, aka AR pods, for use in events or PoIs. 2019-03-28 14:51:50 -04:00
Neerti fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Unknown 03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Neerti 86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown 976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Neerti 765af99014 Merge pull request #5993 from Mechoid/Fix_A_Semicolon
Fixes the greatest bug to affect our time.
2019-03-08 20:19:01 -05:00
Spades 6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Neerti 6211735bac Fixes Diona and Promethean prosthetics. 2019-02-18 03:53:46 -05:00
Neerti b0f219766d Fix Organs not removing their verbs properly. 2019-02-18 03:52:33 -05:00
kevinz000 fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera 2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Andrei Jors 9fb6894a07 Brings this over from Citadel. Ignore the CITADEL CHANGE comments. 2018-10-25 17:16:05 -04:00
Screemonster 5644ee00fd forgot to mark edit 2018-10-10 22:17:20 +01:00
Screemonster b34714684a gives prommie cores an icon 2018-10-10 13:48:22 +01:00
Atermonera 7b92808a20 Merge pull request #5621 from Anewbe/hemophilia
Fixes some bloodloss bugs
2018-10-02 03:11:29 -04:00
Spades d68b641d6b Merge pull request #4287 from Verkister/smallvoreqol
Small qol tweaks for contamination and sleeperguts.
2018-10-01 09:29:08 -04:00
Spades b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018
Polaris Sync 09-27-2018
2018-10-01 08:43:03 -04:00
Arokha Sieyes e1245025b2 Fixes protean brain icons
Was supposed to have a special sprite
2018-09-29 19:43:59 -04:00
Verkister 7a148f2a9d Small qol tweaks for contamination and sleeperguts.
-Removed the toxicity of gurgled items. (Planning to make them affect the user's examine flavor when equipped though.)
-Removed the silly animation on mess overlay. (possible remake later with extra flavors etc)
-Fixed sleeperbellies not suppressing injury emotes and deathmessages during digestion.
-Ruled out the possibility of the sleeperbellies breaking over defined "patient" going "missing".
2018-09-29 16:07:22 +03:00
Arokha Sieyes 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
Atermonera 40a8a9ba15 Merge pull request #5550 from Anewbe/helmet_hair
Helmets now show only certain hairstyles
2018-09-08 11:02:20 -07:00
Anewbe b109cfae42 Helmets now show only certain hairstyles 2018-09-05 19:43:24 -05:00
Anewbe 8c5562b4bc Fixes some bugs tangentially related to Vox code 2018-09-04 21:36:12 -05:00
Mechoid 31761714b2 Adds a Neural implant for future implementation. Promethean brains have been updated to fit it. 2018-08-28 01:23:36 -07:00
Anewbe eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Verkister 6cb51f741a Merge branch 'master' into synthmarking 2018-08-14 09:09:14 +03:00
Aronai Sieyes 939642a564 Merge pull request #4037 from VOREStation/upstream-merge-5386
[MIRROR] Add a procedure for repairing limbs via surgery.
2018-07-21 14:45:35 -04:00
Aronai Sieyes 878b195dbb Merge pull request #4030 from VOREStation/upstream-merge-5402
[MIRROR] Language and Larynx Additions
2018-07-21 14:43:47 -04:00
Aronai Sieyes f29cf429af Merge pull request #3998 from Little-119/dsi-visualtweaks
Removes ears from DSI Vulpkanin head sprites, enables body color for DSI limbs
2018-07-21 11:37:45 -04:00
Arokha Sieyes adbb5b86a5 Fix merge conflicts 2018-07-21 11:34:54 -04:00
Aronai Sieyes 25ad449643 Merge pull request #3996 from VOREStation/upstream-merge-5394
[MIRROR] Adds an option to enable/disable markings on synth parts.
2018-07-17 23:33:50 -04:00
Anewbe 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
Anewbe e98b95baf9 Merge pull request #5386 from Mechoid/End_The_Tyranny_Of_Chemistry
Add a procedure for repairing limbs via surgery.
2018-07-14 14:56:46 -05:00
Anewbe edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Anewbe 8f9e817bf0 Language and Larynx Additions (#5402)
* Various Language Improvements
2018-07-13 21:13:47 -07:00
Aronai Sieyes c369025bfa Synth markings 2018-07-11 21:28:19 -04:00
Mechoid 4b7896678a Add a procedure for repairing limbs via surgery. 2018-07-10 23:48:14 -07:00
Atermonera 4526b0d095 Merge pull request #5403 from Anewbe/get_clothing_on_limb
Limbs can find the clothing that covers them
2018-07-11 00:38:59 -04:00
Anewbe 92b0a773f7 Adds a proc to organs that finds clothing covering said organ 2018-07-09 21:28:11 -05:00
Little-119 8a3be37570 Enables skin_tone on DSI parts 2018-07-08 22:46:58 -04:00
Anewbe 5fff00c4d5 Adds an option to enable/disable markings on synth parts. 2018-07-08 17:36:41 -04:00
Verkister 3b3a4ae19f Adds an option to enable/disable markings on synth parts.
-In char setup near the synth color option.
-Tested working although the preview icon may misbehave with the icon cache. (Meaning the effect will require refreshing the cached icon with a visual change, such as color, markings, limb status change, etc. to show up, and may not show up at all if the appearance is identical to an earlier one already saved to cache and getting loaded from there instead of refreshing.)
2018-07-07 10:46:18 +03:00
Verkister 1b9fb9dc34 overlay system update for the vs edit part 2018-07-07 10:20:12 +03:00