b34714684a
gives prommie cores an icon
2018-10-10 13:48:22 +01:00
7b92808a20
Merge pull request #5621 from Anewbe/hemophilia
...
Fixes some bloodloss bugs
2018-10-02 03:11:29 -04:00
d68b641d6b
Merge pull request #4287 from Verkister/smallvoreqol
...
Small qol tweaks for contamination and sleeperguts.
2018-10-01 09:29:08 -04:00
b8f240f199
Merge pull request #4282 from VOREStation/sync-09272018
...
Polaris Sync 09-27-2018
2018-10-01 08:43:03 -04:00
e1245025b2
Fixes protean brain icons
...
Was supposed to have a special sprite
2018-09-29 19:43:59 -04:00
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
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
40a8a9ba15
Merge pull request #5550 from Anewbe/helmet_hair
...
Helmets now show only certain hairstyles
2018-09-08 11:02:20 -07:00
b109cfae42
Helmets now show only certain hairstyles
2018-09-05 19:43:24 -05:00
8c5562b4bc
Fixes some bugs tangentially related to Vox code
2018-09-04 21:36:12 -05: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
6cb51f741a
Merge branch 'master' into synthmarking
2018-08-14 09:09:14 +03:00
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
878b195dbb
Merge pull request #4030 from VOREStation/upstream-merge-5402
...
[MIRROR] Language and Larynx Additions
2018-07-21 14:43:47 -04:00
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
adbb5b86a5
Fix merge conflicts
2018-07-21 11:34:54 -04:00
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
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
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
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
c369025bfa
Synth markings
2018-07-11 21:28:19 -04:00
4b7896678a
Add a procedure for repairing limbs via surgery.
2018-07-10 23:48:14 -07:00
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
92b0a773f7
Adds a proc to organs that finds clothing covering said organ
2018-07-09 21:28:11 -05:00
8a3be37570
Enables skin_tone on DSI parts
2018-07-08 22:46:58 -04:00
5fff00c4d5
Adds an option to enable/disable markings on synth parts.
2018-07-08 17:36:41 -04:00
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
1b9fb9dc34
overlay system update for the vs edit part
2018-07-07 10:20:12 +03:00
91f250af3b
Adds an option to disable markings on synth limbs.
...
-You can now have clean robolimbs on your artfully painted organic bodies again.
-In char setup near the synth color option.
-Tested working although it requires a physical change (colors, markings, limb status, etc.) to refresh the body cache before it can show up in preview.
2018-07-05 14:31:29 +03:00
c06339487a
Merge branch 'master' into upstream-merge-5335
2018-06-16 17:43:55 -04:00
9fc0b7dabd
Fix merge conflicts
2018-06-16 14:10:02 -04:00
455377f6ff
Use SSoverlays please
2018-06-16 13:42:55 -04:00
c973d4ce69
Fix merge conflict (probably)
...
Not sure if this is the best fix for this, really.
2018-06-15 21:53:55 -04:00
4fb04110d5
Use SSoverlays please
...
You have invoked my wrath by not doing this properly!
2018-06-15 21:51:21 -04:00
a5b5f8e59d
Merge pull request #3856 from VOREStation/upstream-merge-5183
...
[MIRROR] Robolimb brand damage tweaks, makes VeyMed more fragile
2018-06-15 09:06:18 -04:00
02baa415f6
Remove Veymed portion of change for weakness
2018-06-15 08:55:20 -04:00
7cd1442e8f
Ports some Bay hair code
2018-06-12 03:43:57 -04:00
e8020dec9d
Merge pull request #5335 from Anewbe/hair_stealing
...
Ports some Bay hair code
2018-06-12 00:43:43 -07:00
1d054fd29e
Robolimb brand damage tweaks, makes VeyMed more fragile ( #5183 )
...
* Robolimb brand damage tweaks, makes VeyMed more fragile
* Lessens VeyMed damage malus to 10%.
2018-06-10 20:49:11 -04:00
58cca27282
Robolimb brand damage tweaks, makes VeyMed more fragile ( #5183 )
...
* Robolimb brand damage tweaks, makes VeyMed more fragile
* Lessens VeyMed damage malus to 10%.
2018-06-10 17:48:04 -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
17a295b579
Ports some Bay hair code
2018-06-06 20:20:23 -05:00
fad161aeb7
Merge pull request #5319 from SubberTheFabulous/LoveBranded
...
Adds two new sets of robolimbs
2018-06-02 16:22:56 -04:00
4c6f5add29
Two new unbranded prosthesis
2018-06-01 23:15:25 +07: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
Screemonster