From 979cdc6f8a09877b0f4d1aa541924e18ba4b0b7a Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 24 Jan 2018 02:01:45 -0500 Subject: [PATCH 01/47] Polaris port of eye glowing --- .../living/carbon/human/species/species.dm | 1 + .../mob/living/carbon/human/update_icons.dm | 69 +++++++++++++++---- 2 files changed, 57 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 4174613765..7641a48338 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -162,6 +162,7 @@ var/obj/effect/decal/cleanable/blood/tracks/move_trail = /obj/effect/decal/cleanable/blood/tracks/footprints // What marks are left when walking var/list/skin_overlays = list() var/has_floating_eyes = 0 // Whether the eyes can be shown above other icons + var/has_glowing_eyes = 0 // Whether the eyes are shown above all lighting var/water_movement = 0 // How much faster or slower the species is in water var/snow_movement = 0 // How much faster or slower the species is on snow diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index db3bde8757..24ec668a94 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -125,18 +125,19 @@ Please contact me on #coderbus IRC. ~Carn x #define BACK_LAYER 17 #define HAIR_LAYER 18 //TODO: make part of head layer? #define EARS_LAYER 19 -#define FACEMASK_LAYER 20 -#define HEAD_LAYER 21 -#define COLLAR_LAYER 22 -#define HANDCUFF_LAYER 23 -#define LEGCUFF_LAYER 24 -#define L_HAND_LAYER 25 -#define R_HAND_LAYER 26 -#define MODIFIER_EFFECTS_LAYER 27 -#define FIRE_LAYER 28 //If you're on fire -#define WATER_LAYER 29 //If you're submerged in water. -#define TARGETED_LAYER 30 //BS12: Layer for the target overlay from weapon targeting system -#define TOTAL_LAYERS 30 +#define EYES_LAYER 20 +#define FACEMASK_LAYER 21 +#define HEAD_LAYER 22 +#define COLLAR_LAYER 23 +#define HANDCUFF_LAYER 24 +#define LEGCUFF_LAYER 25 +#define L_HAND_LAYER 26 +#define R_HAND_LAYER 27 +#define MODIFIER_EFFECTS_LAYER 28 +#define FIRE_LAYER 29 //If you're on fire +#define WATER_LAYER 30 //If you're submerged in water. +#define TARGETED_LAYER 31 //BS12: Layer for the target overlay from weapon targeting system +#define TOTAL_LAYERS 31 ////////////////////////////////// /mob/living/carbon/human @@ -472,6 +473,7 @@ var/global/list/damage_icon_parts = list() //Reset our hair overlays_standing[HAIR_LAYER] = null + update_eyes(0) //Pirated out of here, for glowing eyes. var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) if(!head_organ || head_organ.is_stump() ) @@ -510,9 +512,50 @@ var/global/list/damage_icon_parts = list() face_standing += rgb(,,,120) overlays_standing[HAIR_LAYER] = image(face_standing) - if(update_icons) update_icons_layers() +/mob/living/carbon/human/update_eyes(var/update_icons=1) + if(QDESTROYING(src)) + return + + //Reset our eyes + overlays_standing[EYES_LAYER] = null + + //This is ONLY for glowing eyes for now. Boring flat eyes are done by the head's own proc. + if(!species.has_glowing_eyes) + if(update_icons) update_icons_layers() + return + + //Our glowy eyes should be hidden if some equipment hides them. + if(!should_have_organ(O_EYES) || (head && (head.flags_inv & BLOCKHAIR)) || (wear_mask && (wear_mask.flags_inv & BLOCKHAIR))) + if(update_icons) update_icons_layers() + return + + //Get the head, we'll need it later. + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump() ) + if(update_icons) update_icons_layers() + return + + //The eyes store the color themselves, funny enough. + var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES] + if(!head_organ.eye_icon) + if(update_icons) update_icons_layers() + return + + var/icon/eyes_icon = new/icon(head_organ.eye_icon_location, head_organ.eye_icon) + if(eyes) + eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD) + else + eyes_icon.Blend(rgb(128,0,0), ICON_ADD) + + var/image/eyes_image = image(eyes_icon) + eyes_image.plane = PLANE_LIGHTING_ABOVE + + overlays_standing[EYES_LAYER] = eyes_image + + if(update_icons) update_icons_layers() + /mob/living/carbon/human/update_mutations(var/update_icons=1) if(QDESTROYING(src)) return From ed0a97fa138611d488e6966e60de775d25c80ddf Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 22 Jan 2018 17:23:06 -0500 Subject: [PATCH 02/47] POLARIS: Allow testing more than just z1 --- code/unit_tests/map_tests.dm | 4 +++- maps/~map_system/maps.dm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm index 92d17a2aba..c5bccc437d 100644 --- a/code/unit_tests/map_tests.dm +++ b/code/unit_tests/map_tests.dm @@ -39,8 +39,10 @@ exempt_from_atmos += using_map.unit_test_exempt_from_atmos.Copy() exempt_from_apc += using_map.unit_test_exempt_from_apc.Copy() + var/list/zs_to_test = using_map.unit_test_z_levels || list(1) //Either you set it, or you just get z1 + for(var/area/A in world) - if(A.z == 1 && !(A.type in exempt_areas)) + if((A.z in zs_to_test) && !(A.type in exempt_areas)) area_test_count++ var/area_good = 1 var/bad_msg = "--------------- [A.name]([A.type])" diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 0339eb9f13..ae40bc129c 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -78,6 +78,7 @@ var/list/all_maps = list() var/list/unit_test_exempt_areas = list() var/list/unit_test_exempt_from_atmos = list() var/list/unit_test_exempt_from_apc = list() + var/list/unit_test_z_levels //To test more than Z1, set your z-levels to test here. /datum/map/New() ..() From d4fc7fbada668573b8da6c7bd9d2e9eb284c796e Mon Sep 17 00:00:00 2001 From: Mechoid Date: Fri, 19 Jan 2018 12:48:20 -0800 Subject: [PATCH 03/47] Fixes crawling when standing. No more accidentally crawling when buckling. --- code/game/turfs/turf.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 8d708e8c7e..d3abc04352 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -91,7 +91,7 @@ turf/attackby(obj/item/weapon/W as obj, mob/user as mob) return if(istype(O, /obj/screen)) return - if(user.restrained() || user.stat || user.stunned || user.paralysis) + if(user.restrained() || user.stat || user.stunned || user.paralysis || (!user.lying && !istype(user, /mob/living/silicon/robot))) return if((!(istype(O, /atom/movable)) || O.anchored || !Adjacent(user) || !Adjacent(O) || !user.Adjacent(O))) return From 11d78d38a30eba4246871bcc0f31bb38a4b0c82b Mon Sep 17 00:00:00 2001 From: atermonera Date: Thu, 25 Jan 2018 21:55:12 -0800 Subject: [PATCH 04/47] Updates changelog --- html/changelog.html | 38 ++++++++++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 32 +++++++++++++++++++++++++ html/changelogs/example - Copy.yml | 5 ---- 3 files changed, 70 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/example - Copy.yml diff --git a/html/changelog.html b/html/changelog.html index 280b45a1bb..4d76952944 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,44 @@ -->
+

25 January 2018

+

Leshana updated:

+
    +
  • Sounds of Tesla engine lighting bolts
    • +
  • Sprites for grounding rod and Tesla coil
    • +
  • Sprites for lighting bolts
    • +
  • The Tesla Engine, Tesla Coils, and Grounding Rods
    • +
  • Wiki search URL is now configurable in config.txt
    • +
+

Mechoid updated:

+
    +
  • Brains can be set to be a source of genetic information.
    • +
  • Promethean cores can be inserted into a cloning scanner to be cloned. This gives them a worse modifier upon completion.
    • +
  • Promethean cores can now have chemicals added or removed from them. Base for future slime cloner.
    • +
  • Species-based cloning sicknesses possible.
    • +
  • Cyboernetic - > Cybernetic
    • +
+

Neerti updated:

+
    +
  • Adds boats that can be ridden by multiple people, which use oars. Can be crafted with large amounts of wooden planks.
    • +
  • Adds autopilot functionality to Southern Cross Shuttle One and Shuttle Two.
    • +
  • Adds ability to rename certain shuttles on the Southern Cross.
    • +
  • Areas about to be occupied by a shuttle will display a visual warning, of a bunch of circles growing over five seconds.
    • +
+

SunnyDaff updated:

+
    +
  • Added new food items.
    • +
  • Added Cider.
    • +
  • Added Apple Juice to bar vending machine.
    • +
  • Fixed Vodka recipe.
    • +
  • Fixed Apple and Carrot cake recipes
    • +
  • Changed Cake recipes to not include fruit juice
    • +
+

ZeroBits updated:

+
    +
  • Added the ability to have multiple loadouts per character.
    • +
+

12 January 2018

Atermonera updated:

+ {{/if}} + {{/if}} + {{/if}} + {{/if}} {{/if}} From 17028ddb58bcfacebebde14b9b69d6d75abe1241 Mon Sep 17 00:00:00 2001 From: Belsima <31827220+Belsima@users.noreply.github.com> Date: Wed, 31 Jan 2018 15:54:01 -0500 Subject: [PATCH 45/47] curren --- nano/templates/communicator.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nano/templates/communicator.tmpl b/nano/templates/communicator.tmpl index 60558b84c8..6ef7de1607 100644 --- a/nano/templates/communicator.tmpl +++ b/nano/templates/communicator.tmpl @@ -242,7 +242,7 @@ Used In File(s): code\game\objects\items\devices\communicator\communicator.dm
{{:helper.link('Home', 'home', {'switch_tab' : 1})}}

-

Curren Conditions:

+

Current Conditions:

{{if data.aircontents.reading == 1}}
@@ -402,4 +402,4 @@ Used In File(s): code\game\objects\items\devices\communicator\communicator.dm -{{/if}} \ No newline at end of file +{{/if}} From 0714585c38d800a4ef85fef74ab690ce361127d9 Mon Sep 17 00:00:00 2001 From: Woodratt Date: Wed, 31 Jan 2018 16:22:02 -0800 Subject: [PATCH 46/47] Fix for Camera Networks - Proper Camera Networks should be on the Camera console now - Miner name change for Tcomm Network - Removal of the unneeded Network list --- code/__defines/machinery.dm | 2 +- maps/southern_cross/southern_cross_defines.dm | 22 ++++++++++++++++++- maps/southern_cross/southern_cross_presets.dm | 18 --------------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index b577225e01..877982691e 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -53,7 +53,7 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called #define NETWORK_PRISON "Prison" #define NETWORK_SECURITY "Security" #define NETWORK_INTERROGATION "Interrogation" -#define NETWORK_TELECOM "Tcomsat" +#define NETWORK_TELECOM "Tcomms" #define NETWORK_THUNDER "Thunderdome" #define NETWORK_COMMUNICATORS "Communicators" diff --git a/maps/southern_cross/southern_cross_defines.dm b/maps/southern_cross/southern_cross_defines.dm index aaacaa8cf0..a53dd09ef2 100644 --- a/maps/southern_cross/southern_cross_defines.dm +++ b/maps/southern_cross/southern_cross_defines.dm @@ -39,7 +39,27 @@ emergency_shuttle_called_message = "An emergency evacuation shuttle has been called. It will arrive at docks one and two in approximately %ETA%" emergency_shuttle_recall_message = "The emergency shuttle has been recalled." - station_networks = list() + // Networks that will show up as options in the camera monitor program + station_networks = list( + NETWORK_CARGO, + NETWORK_CIVILIAN, + NETWORK_COMMAND, + NETWORK_ENGINE, + NETWORK_ENGINEERING, + NETWORK_ENGINEERING_OUTPOST, + NETWORK_FIRST_DECK, + NETWORK_SECOND_DECK, + NETWORK_THIRD_DECK, + NETWORK_MAIN_OUTPOST, + NETWORK_MEDICAL, + NETWORK_MINE, + NETWORK_RESEARCH, + NETWORK_RESEARCH_OUTPOST, + NETWORK_ROBOTS, + NETWORK_PRISON, + NETWORK_SECURITY, + NETWORK_TELECOM + ) allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage") unit_test_exempt_areas = list(/area/ninja_dojo, /area/ninja_dojo/firstdeck, /area/ninja_dojo/arrivals_dock) diff --git a/maps/southern_cross/southern_cross_presets.dm b/maps/southern_cross/southern_cross_presets.dm index 2bc8a0fe3c..a21b1c02c0 100644 --- a/maps/southern_cross/southern_cross_presets.dm +++ b/maps/southern_cross/southern_cross_presets.dm @@ -4,24 +4,6 @@ var/const/NETWORK_FIRST_DECK = "First Deck" var/const/NETWORK_SUPPLY = "Supply" var/const/NETWORK_MAIN_OUTPOST = "Main Outpost" -/datum/map/southern_cross - // Networks that will show up as options in the camera monitor program - station_networks = list( - NETWORK_ENGINE, - NETWORK_THIRD_DECK, - NETWORK_SECOND_DECK, - NETWORK_FIRST_DECK, - NETWORK_ROBOTS, - NETWORK_SUPPLY, - NETWORK_COMMAND, - NETWORK_ENGINEERING, - NETWORK_MEDICAL, - NETWORK_MAIN_OUTPOST, - NETWORK_RESEARCH, - NETWORK_SECURITY, - NETWORK_THUNDER, - ) - // // Cameras // From f68cf380aeb5f180fba4921cbdd9ee155b884fcd Mon Sep 17 00:00:00 2001 From: Woodratt Date: Wed, 31 Jan 2018 23:13:30 -0800 Subject: [PATCH 47/47] Gun Cabinet hotfix - Should fix explorers not being able to get into their gun cabinets --- .../structures/crates_lockers/closets/secure/guncabinet.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index f9f77fa684..f4f24e8d50 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -1,6 +1,6 @@ /obj/structure/closet/secure_closet/guncabinet name = "gun cabinet" - req_access = list(access_armory) + req_one_access = list(access_armory) icon = 'icons/obj/guncabinet.dmi' icon_state = "base" icon_off ="base"